Fixed Windows binary which accidentally turned out to be x32. Also ha…

…ndbuilt Linux bin since one from build server didn't work. Will investigate further.
olegtarasov · Jun 10, 2019 · d965eff · d965eff
1 parent f12bb93
commit d965eff
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/FastText.NetWrapper.sln b/FastText.NetWrapper.sln
@@ -1,26 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28922.388
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FastText.NetWrapper", "FastText.NetWrapper\FastText.NetWrapper.csproj", "{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastText.NetWrapper", "FastText.NetWrapper\FastText.NetWrapper.csproj", "{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtil", "TestUtil\TestUtil.csproj", "{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtil", "TestUtil\TestUtil.csproj", "{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}.Debug|x64.ActiveCfg = Debug|x64
-		{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}.Debug|x64.Build.0 = Debug|x64
-		{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}.Release|x64.ActiveCfg = Release|x64
-		{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}.Release|x64.Build.0 = Release|x64
-		{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}.Debug|x64.ActiveCfg = Debug|x64
-		{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}.Debug|x64.Build.0 = Debug|x64
-		{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}.Release|x64.ActiveCfg = Release|x64
-		{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}.Release|x64.Build.0 = Release|x64
+		{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}.Debug|x64.Build.0 = Debug|Any CPU
+		{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}.Release|x64.ActiveCfg = Release|Any CPU
+		{E9BCD9F6-D9D9-4F12-B440-6B65585106B0}.Release|x64.Build.0 = Release|Any CPU
+		{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}.Debug|x64.Build.0 = Debug|Any CPU
+		{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}.Release|x64.ActiveCfg = Release|Any CPU
+		{4530C4C1-77DC-44DB-8199-3B0BAE6E4656}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/FastText.NetWrapper/FastText.NetWrapper.csproj b/FastText.NetWrapper/FastText.NetWrapper.csproj
@@ -18,9 +18,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FastText.Native.Linux" Version="1.0.67" />
+    <None Remove="Resources\libfasttext.so" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\libfasttext.so" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="FastText.Native.MacOs" Version="1.0.66" />
-    <PackageReference Include="FastText.Native.Windows" Version="1.0.65" />
+    <PackageReference Include="FastText.Native.Windows" Version="1.0.68" />
     <PackageReference Include="LibLog" Version="5.0.6" />
     <PackageReference Include="NativeLibraryManager" Version="1.0.14" />
   </ItemGroup>

diff --git a/FastText.NetWrapper/Resources/libfasttext.so b/FastText.NetWrapper/Resources/libfasttext.so