Skip to content

Commit

Permalink
2024-08-25 - Updated packages
Browse files Browse the repository at this point in the history
Updated NuGet packages.
Discord complained about the 7-zipped files, but not zipped files... Updating these should help. Also will need CEF users to download newer copies of CEF files.
  • Loading branch information
TCNOco committed Aug 25, 2024
1 parent c3ee210 commit 0fe925b
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 20 deletions.
12 changes: 6 additions & 6 deletions TcNo-Acc-Switcher-Client/TcNo-Acc-Switcher-Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CefSharp.Common" Version="126.2.70" />
<PackageReference Include="CefSharp.Wpf.NETCore" Version="126.2.70" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
<PackageReference Include="CefSharp.Common" Version="127.3.50" />
<PackageReference Include="CefSharp.Wpf.NETCore" Version="127.3.50" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -66,15 +66,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="chromiumembeddedframework.runtime.win-arm64" Version="126.2.7" />
<PackageReference Update="chromiumembeddedframework.runtime.win-arm64" Version="127.3.5" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="chromiumembeddedframework.runtime.win-x64" Version="126.2.7" />
<PackageReference Update="chromiumembeddedframework.runtime.win-x64" Version="127.3.5" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="chromiumembeddedframework.runtime.win-x86" Version="126.2.7" />
<PackageReference Update="chromiumembeddedframework.runtime.win-x86" Version="127.3.5" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions TcNo-Acc-Switcher-Globals/TcNo-Acc-Switcher-Globals.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.64" />
<PackageReference Include="IconLib.Unofficial" Version="0.73.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
<PackageReference Include="SevenZipExtractor" Version="1.0.17" />
<PackageReference Include="Squid-Box.SevenZipSharp" Version="1.6.2.24" />
<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
<PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
<PackageReference Include="YamlDotNet" Version="15.3.0" />
<PackageReference Include="YamlDotNet" Version="16.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions TcNo-Acc-Switcher-Server/TcNo-Acc-Switcher-Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
<PackageReference Include="Gameloop.Vdf" Version="0.6.2" />
<PackageReference Include="Gameloop.Vdf.JsonConverter" Version="0.2.1" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.9.1" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.64" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.10.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.8" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2651.64" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SharpScss" Version="2.0.0" />
<PackageReference Include="SteamKit2" Version="2.5.0" />
<PackageReference Include="Svg.Skia" Version="1.0.0.18" />
<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
<PackageReference Include="YamlDotNet" Version="15.3.0" />
<PackageReference Include="Svg.Skia" Version="2.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
<PackageReference Include="YamlDotNet" Version="16.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TcNo-Acc-Switcher-Globals\TcNo-Acc-Switcher-Globals.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion TcNo-Acc-Switcher-Tray/TcNo-Acc-Switcher-Tray.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="YamlDotNet" Version="15.3.0" />
<PackageReference Include="YamlDotNet" Version="16.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
15 changes: 13 additions & 2 deletions TcNo-Acc-Switcher-Updater/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1050,19 +1050,27 @@ private void CloseIfRunning(string currentDir)
/// <summary>
/// Used by TroubleChute to create updates for the program.
/// </summary>
private static void CreateUpdate()
private void CreateUpdate()
{
WriteLine("Creating update..." + Environment.NewLine);
// CREATE UPDATE
const string oldFolder = "OldVersion";
const string newFolder = "TcNo-Acc-Switcher";
const string outputFolder = "UpdateOutput";
// Create if doesn't exist
_ = Directory.CreateDirectory(outputFolder);

var deleteFileList = Path.Join(outputFolder, "filesToDelete.txt");
RecursiveDelete(outputFolder, false);
WriteLine("RecursiveDelete..." + Environment.NewLine);
DeleteFile(deleteFileList);
WriteLine("deleteFileList..." + Environment.NewLine);

List<string> filesToDelete = new(); // Simply ignore these later
WriteLine("CreateFolderPatches..." + Environment.NewLine);
CreateFolderPatches(oldFolder, newFolder, outputFolder, ref filesToDelete);
File.WriteAllLines(deleteFileList, filesToDelete);
WriteLine("Done!" + Environment.NewLine);
Environment.Exit(0);
}

Expand Down Expand Up @@ -1242,7 +1250,7 @@ private void ApplyPatches(string oldFolder, string outputFolder)
/// <param name="newFolder">Path of reference new version files</param>
/// <param name="outputFolder">Path to output patch files, new files and list of files to delete</param>
/// <param name="filesToDelete"></param>
private static void CreateFolderPatches(string oldFolder, string newFolder, string outputFolder, ref List<string> filesToDelete)
private void CreateFolderPatches(string oldFolder, string newFolder, string outputFolder, ref List<string> filesToDelete)
{
_ = Directory.CreateDirectory(outputFolder);

Expand All @@ -1253,6 +1261,7 @@ private static void CreateFolderPatches(string oldFolder, string newFolder, stri
// -----------------------------------
// SAVE DICT OF NEW FILES & HASHES
// -----------------------------------
WriteLine("SAVE DICT OF NEW FILES & HASHES...");
File.WriteAllText(Path.Join(outputFolder, "hashes.json"), JsonConvert.SerializeObject(_allNewDict, Formatting.Indented));


Expand Down Expand Up @@ -1281,6 +1290,7 @@ private static void CreateFolderPatches(string oldFolder, string newFolder, stri
// -----------------------------------
// HANDLE NEW FILES
// -----------------------------------
WriteLine("HANDLE NEW FILES...");
// Copy new files into output\\new
var outputNewFolder = Path.Join(outputFolder, "new");
_ = Directory.CreateDirectory(outputNewFolder);
Expand All @@ -1297,6 +1307,7 @@ private static void CreateFolderPatches(string oldFolder, string newFolder, stri
// -----------------------------------
// HANDLE DIFFERENT FILES
// -----------------------------------
WriteLine("HANDLE DIFFERENT FILES..." + Environment.NewLine);
foreach (var differentFile in differentFiles)
{
var oldFileInput = Path.Join(oldFolder, differentFile);
Expand Down
2 changes: 1 addition & 1 deletion TcNo-Acc-Switcher-Updater/TcNo-Acc-Switcher-Updater.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SevenZipExtractor" Version="1.0.17" />
<PackageReference Include="VCDiff" Version="4.0.1" />
<PackageReference Include="YamlDotNet" Version="15.3.0" />
<PackageReference Include="YamlDotNet" Version="16.0.0" />
</ItemGroup>

</Project>

0 comments on commit 0fe925b

Please sign in to comment.