From 5b980278d883aa76242fe5b970d6515793eb25d9 Mon Sep 17 00:00:00 2001
From: sciencewhiz <sciencewhiz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 11:33:12 -0800
Subject: [PATCH 1/5] Update NuGet dependencies to fix vulnerability warn

---
 WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj b/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj
index 3fe074c..dc76515 100644
--- a/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj
+++ b/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj
@@ -55,6 +55,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
     <PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
+    <PackageReference Include="SkiaSharp" Version="2.88.9" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.3" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Assets\wpilib-generic-75.png" />

From 3d3c4c39020e4db230a0c011a3f7e1ee18c556eb Mon Sep 17 00:00:00 2001
From: sciencewhiz <sciencewhiz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 12:17:43 -0800
Subject: [PATCH 2/5] Update IsoCreator packages

---
 IsoCreator/IsoCreator.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IsoCreator/IsoCreator.csproj b/IsoCreator/IsoCreator.csproj
index d34a581..cfddfa6 100644
--- a/IsoCreator/IsoCreator.csproj
+++ b/IsoCreator/IsoCreator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -9,6 +9,8 @@
   <ItemGroup>
     <PackageReference Include="Discutils" Version="0.16.13" />
     <PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.21216.1" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 
 </Project>

From 60837e8670be507f5a96035c5865961a7d82c840 Mon Sep 17 00:00:00 2001
From: sciencewhiz <sciencewhiz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 12:39:01 -0800
Subject: [PATCH 3/5] Add global.json to keep .net 9 from being used

---
 IsoCreator/global.json               | 6 ++++++
 WPILibInstaller-Avalonia/global.json | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 IsoCreator/global.json
 create mode 100644 WPILibInstaller-Avalonia/global.json

diff --git a/IsoCreator/global.json b/IsoCreator/global.json
new file mode 100644
index 0000000..f57c801
--- /dev/null
+++ b/IsoCreator/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "rollForward": "latestFeature",
+    "version": "8.0.100"
+  }
+}
\ No newline at end of file
diff --git a/WPILibInstaller-Avalonia/global.json b/WPILibInstaller-Avalonia/global.json
new file mode 100644
index 0000000..f57c801
--- /dev/null
+++ b/WPILibInstaller-Avalonia/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "rollForward": "latestFeature",
+    "version": "8.0.100"
+  }
+}
\ No newline at end of file

From 584b2cfee5e38707671d175ded8e64b3703a2b70 Mon Sep 17 00:00:00 2001
From: sciencewhiz <sciencewhiz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 13:09:28 -0800
Subject: [PATCH 4/5] Revert "Add global.json to keep .net 9 from being used"

This reverts commit 60837e8670be507f5a96035c5865961a7d82c840.
---
 IsoCreator/global.json               | 6 ------
 WPILibInstaller-Avalonia/global.json | 6 ------
 2 files changed, 12 deletions(-)
 delete mode 100644 IsoCreator/global.json
 delete mode 100644 WPILibInstaller-Avalonia/global.json

diff --git a/IsoCreator/global.json b/IsoCreator/global.json
deleted file mode 100644
index f57c801..0000000
--- a/IsoCreator/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "rollForward": "latestFeature",
-    "version": "8.0.100"
-  }
-}
\ No newline at end of file
diff --git a/WPILibInstaller-Avalonia/global.json b/WPILibInstaller-Avalonia/global.json
deleted file mode 100644
index f57c801..0000000
--- a/WPILibInstaller-Avalonia/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "rollForward": "latestFeature",
-    "version": "8.0.100"
-  }
-}
\ No newline at end of file

From 856c869672652a05205788175d96c80a2f0cb2df Mon Sep 17 00:00:00 2001
From: sciencewhiz <sciencewhiz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 13:12:55 -0800
Subject: [PATCH 5/5] Supress NuGet false positives with .NET 9.100

https://github.com/NuGet/Home/issues/7344
---
 WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj b/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj
index dc76515..c9e7502 100644
--- a/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj
+++ b/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj
@@ -102,4 +102,10 @@
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
+
+  <ItemGroup>
+    <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-5f2m-466j-3848" />
+    <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-x5qj-9vmx-7g6g" />
+    <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-xhfc-gr8f-ffwc" />
+  </ItemGroup>
 </Project>