Maintenance for nugets (#26)

* .net framework 4.6.2 (supported) till end of windows 10 * dependabot newtonsoft
cliveontoast · Sep 24, 2022 · 4d890f4 · 4d890f4
1 parent c3ef5e9
commit 4d890f4
Show file tree

Hide file tree

Showing 13 changed files with 2,686 additions and 18 deletions.
diff --git a/Build-Test-Zip.bat b/Build-Test-Zip.bat
@@ -4,11 +4,16 @@ del /Q /S /F .\test-image\*.mp4
 del /Q /S /F .\test-image\*.gif
 del /Q /S /F .\split
 dotnet build src\GoMoPhoFrameworkConsole\GoMoPhoFrameworkConsole.csproj
-dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj -o .\bin\CrossPlatform
-dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj -r win-x64 -o .\bin\WindowsCore
-dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj -r linux-x64 -o .\bin\GNULinux
-dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj -r ubuntu-x64 -o .\bin\Ubuntu
-dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj -r osx-x64 -o .\bin\macOS
+del /S packages.lock.json
+dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj --output .\bin\CrossPlatform
+del /S packages.lock.json
+dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj --runtime win-x64 --output .\bin\WindowsCore
+del /S packages.lock.json
+dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj --runtime linux-x64 --output .\bin\GNULinux
+del /S packages.lock.json
+dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj --runtime ubuntu-x64 --output .\bin\Ubuntu
+del /S packages.lock.json
+dotnet publish src\GoMoPhoConsole\GoMoPhoCoreConsole.csproj --runtime osx-x64 --output .\bin\macOS
 
 dotnet bin\CrossPlatform\GoMoPhoCoreConsole.dll d test-image\ g h pattern "MVIMG_20180910_12441*.jpg"
 rem windows only

diff --git a/README.md b/README.md
@@ -166,6 +166,17 @@ dotnet build src\GoogleMotionImage.sln
 ```
 Windows: Run  Build-Test-Zip.bat file to compile and test the program.
 
+## Nuget rebuild lock files
+http://blog.ctaggart.com/2019/03/using-nuget-lock-file-for-reproducible.html
+```
+dotnet nuget locals all --clear
+git clean -xfd
+git rm **/packages.lock.json -f
+dotnet restore GoogleMotionImage.sln
+or
+dotnet restore GoogleMotionImage.sln --force-evaluate
+```
+
 #### Testing in windows
 ```
 Build-Test-Zip.bat

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+  <PropertyGroup>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <RestoreLockedMode>true</RestoreLockedMode>
+    <NoWarn>NU1603</NoWarn>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
+  </PropertyGroup>
+</Project>
diff --git a/src/GoMoPho/FFmpegGif.cs b/src/GoMoPho/FFmpegGif.cs
@@ -53,6 +53,7 @@ private static async Task<bool> GetFFmpeg()
                 //Get latest version of FFmpeg. It's great idea if you don't know if you had installed FFmpeg.
                 await Console.Out.WriteLineAsync($"Getting FFMpeg, saving to {TempLocation}");
                 await FFmpegDownloader.GetLatestVersion(FFmpegVersion.Official, TempLocation);
+                FFmpeg.SetExecutablesPath(TempLocation);
             }
             catch (Exception e)
             {

diff --git a/src/GoMoPho/GoMoPho.csproj b/src/GoMoPho/GoMoPho.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xabe.FFmpeg" Version="5.0.2" />
-    <PackageReference Include="Xabe.FFmpeg.Downloader" Version="5.0.2" />
+    <PackageReference Include="Xabe.FFmpeg" Version="5.2.0" />
+    <PackageReference Include="Xabe.FFmpeg.Downloader" Version="5.2.0" />
   </ItemGroup>
 
 </Project>