Consolidate icons (#457)

wpilibsuite · Oct 19, 2024 · 28900e5 · 28900e5
1 parent 0c6d58e
commit 28900e5
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj b/WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>WPILibInstaller</AssemblyName>
     <RootNamespace>WPILibInstaller</RootNamespace>
-    <ApplicationIcon>wpilib-256.ico</ApplicationIcon>
+    <ApplicationIcon>Assets\wpilib-256.ico</ApplicationIcon>
     <Win32Resource />
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/WPILibInstaller-Avalonia/wpilib-256.ico b/WPILibInstaller-Avalonia/wpilib-256.ico
diff --git a/WPILibShortcutCreator/src/main/rc/WPILibShortcutCreator.rc b/WPILibShortcutCreator/src/main/rc/WPILibShortcutCreator.rc
@@ -1 +1 @@
-WPILibShortcutCreator ICON "wpilib-256.ico"
+WPILibShortcutCreator ICON "../../../../WPILibInstaller-Avalonia/Assets/wpilib-256.ico"
diff --git a/WPILibShortcutCreator/src/main/rc/wpilib-256.ico b/WPILibShortcutCreator/src/main/rc/wpilib-256.ico
diff --git a/files/wpilib-256.ico b/files/wpilib-256.ico
diff --git a/scripts/vars.gradle b/scripts/vars.gradle
@@ -3,7 +3,7 @@ def varsfilePS = file("files/frcvars.ps1")
 def varsfilesh = file("files/frcvars.sh")
 def codefile = file("files/frccode")
 def codefileCmd = file("files/frccode.cmd")
-def icoFile = file("files/wpilib-256.ico")
+def icoFile = file("WPILibInstaller-Avalonia/Assets/wpilib-256.ico")
 def codeAppArmorFile = file("files/frccode.AppArmor")
 def utilAppArmorFile = file("files/wpilibutility.AppArmor")
 def advantagescopeAppArmorFile = file("files/advantagescope.AppArmor")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		WPILibShortcutCreator ICON "wpilib-256.ico"
		WPILibShortcutCreator ICON "../../../../WPILibInstaller-Avalonia/Assets/wpilib-256.ico"