Skip to content

Commit bee81bf

Browse files
committed
Merge branch 'v1.2'
2 parents a7dcf8d + 4af8e0f commit bee81bf

14 files changed

Lines changed: 1005 additions & 393 deletions

.github/workflows/BuildAndPublish.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ on:
44
push:
55
tags:
66
- '*'
7-
branches:
8-
- master
97

108
jobs:
119
test:
1210
if: ${{ !contains(github.event.head_commit.message, 'skip ci') }}
1311
runs-on: ${{ matrix.os }}
1412
strategy:
1513
matrix:
16-
os: [ubuntu-latest, macos-latest] #, windows-latest] # Disabling Windows tests due to random bad allocations on Github Windows images.
14+
os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, windows-2019, macos-10.15]
1715
steps:
1816
- uses: actions/checkout@v2
1917

ConsoleTest/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static void Main(string[] args)
3131
string outPath = Path.Combine(tempDir, "cooking.bin");
3232
var fastText = new FastTextWrapper(loggerFactory: new LoggerFactory(new[] {new SerilogLoggerProvider()}));
3333

34-
var ftArgs = FastTextArgs.SupervisedDefaults();
34+
var ftArgs = new SupervisedArgs();
3535
ftArgs.epoch = 15;
3636
ftArgs.lr = 1;
3737
ftArgs.dim = 300;

FastText.NetWrapper.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\Unit
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTest", "ConsoleTest\ConsoleTest.csproj", "{8C2DFE2B-9DCE-4236-B933-0D46ED804572}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NugetConsoleTest", "NugetConsoleTest\NugetConsoleTest.csproj", "{86AB2CB1-9F72-4BC8-8090-EE14494F5EBE}"
13-
EndProject
1412
Global
1513
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1614
Debug|x64 = Debug|x64
@@ -29,10 +27,6 @@ Global
2927
{8C2DFE2B-9DCE-4236-B933-0D46ED804572}.Debug|x64.Build.0 = Debug|Any CPU
3028
{8C2DFE2B-9DCE-4236-B933-0D46ED804572}.Release|x64.ActiveCfg = Release|Any CPU
3129
{8C2DFE2B-9DCE-4236-B933-0D46ED804572}.Release|x64.Build.0 = Release|Any CPU
32-
{86AB2CB1-9F72-4BC8-8090-EE14494F5EBE}.Debug|x64.ActiveCfg = Debug|Any CPU
33-
{86AB2CB1-9F72-4BC8-8090-EE14494F5EBE}.Debug|x64.Build.0 = Debug|Any CPU
34-
{86AB2CB1-9F72-4BC8-8090-EE14494F5EBE}.Release|x64.ActiveCfg = Release|Any CPU
35-
{86AB2CB1-9F72-4BC8-8090-EE14494F5EBE}.Release|x64.Build.0 = Release|Any CPU
3630
EndGlobalSection
3731
GlobalSection(SolutionProperties) = preSolution
3832
HideSolutionNode = FALSE

FastText.NetWrapper/FastText.NetWrapper.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@
1212
<PackageVersion>1.0.1</PackageVersion>
1313
<PackageLicenseUrl>https://raw.githubusercontent.com/olegtarasov/FastText.NetWrapper/master/LICENSE</PackageLicenseUrl>
1414
<PackageReleaseNotes>Attention! We are deprecating some methods in 1.1 and replacing them with new API. Migration is really straightforward, but please be sure to read https://github.com/olegtarasov/FastText.NetWrapper/blob/master/README.md for guidance.</PackageReleaseNotes>
15+
<LangVersion>latest</LangVersion>
1516
</PropertyGroup>
1617

1718
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
1819
<DocumentationFile>bin\Release\FastText.NetWrapper.xml</DocumentationFile>
1920
</PropertyGroup>
2021

2122
<ItemGroup>
22-
<PackageReference Include="AutoMapper" Version="9.0.0" />
23-
<PackageReference Include="FastText.Native.Linux" Version="1.0.101" />
24-
<PackageReference Include="FastText.Native.MacOs" Version="1.0.101" />
25-
<PackageReference Include="FastText.Native.Windows" Version="1.0.101" />
23+
<PackageReference Include="AutoMapper" Version="10.0.0" />
24+
<PackageReference Include="FastText.Native.Linux" Version="1.0.109" />
25+
<PackageReference Include="FastText.Native.MacOs" Version="1.0.109" />
26+
<PackageReference Include="FastText.Native.Windows" Version="1.0.109" />
2627
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.5" />
2728
<PackageReference Include="NativeLibraryManager" Version="1.0.23" />
2829
</ItemGroup>

0 commit comments

Comments
 (0)