diff --git a/WPinternals/App.xaml.cs b/WPinternals/App.xaml.cs index 653753d..ce55d04 100644 --- a/WPinternals/App.xaml.cs +++ b/WPinternals/App.xaml.cs @@ -77,14 +77,14 @@ namespace WPinternals Registration.CheckExpiration(); string PatchDefintionsXml; - string PatchDefintionsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PatchDefintions.xml"); + string PatchDefintionsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "PatchDefintions.xml"); if (File.Exists(PatchDefintionsPath)) { PatchDefintionsXml = File.ReadAllText(PatchDefintionsPath); } else { - using Stream stream = System.Reflection.Assembly.GetEntryAssembly().GetManifestResourceStream("WPinternals.PatchDefinitions.xml"); + using Stream stream = System.Reflection.Assembly.GetEntryAssembly().GetManifestResourceStream("WPinternals.Assets.PatchDefinitions.xml"); using StreamReader sr = new(stream); PatchDefintionsXml = sr.ReadToEnd(); } diff --git a/WPinternals/Logo-Small.png b/WPinternals/Assets/Logo-Small.png similarity index 100% rename from WPinternals/Logo-Small.png rename to WPinternals/Assets/Logo-Small.png diff --git a/WPinternals/Logo.png b/WPinternals/Assets/Logo.png similarity index 100% rename from WPinternals/Logo.png rename to WPinternals/Assets/Logo.png diff --git a/WPinternals/PatchDefinitions.xml b/WPinternals/Assets/PatchDefinitions.xml similarity index 100% rename from WPinternals/PatchDefinitions.xml rename to WPinternals/Assets/PatchDefinitions.xml diff --git a/WPinternals/PhoneReboot.png b/WPinternals/Assets/PhoneReboot.png similarity index 100% rename from WPinternals/PhoneReboot.png rename to WPinternals/Assets/PhoneReboot.png diff --git a/WPinternals/SB b/WPinternals/Assets/SB similarity index 100% rename from WPinternals/SB rename to WPinternals/Assets/SB diff --git a/WPinternals/SBA b/WPinternals/Assets/SBA similarity index 100% rename from WPinternals/SBA rename to WPinternals/Assets/SBA diff --git a/WPinternals/SBMSM b/WPinternals/Assets/SBMSM similarity index 100% rename from WPinternals/SBMSM rename to WPinternals/Assets/SBMSM diff --git a/WPinternals/WPinternals.ico b/WPinternals/Assets/WPinternals.ico similarity index 100% rename from WPinternals/WPinternals.ico rename to WPinternals/Assets/WPinternals.ico diff --git a/WPinternals/aerobusy.gif b/WPinternals/Assets/aerobusy.gif similarity index 100% rename from WPinternals/aerobusy.gif rename to WPinternals/Assets/aerobusy.gif diff --git a/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs b/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs index 4cecebf..a7508ca 100644 --- a/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs +++ b/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs @@ -2108,7 +2108,7 @@ namespace WPinternals Part = new FlashPart(); Partition TargetPartition = GPT.GetPartition("UEFI_BS_NV"); Part.StartSector = (UInt32)TargetPartition.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't. - string SBRes = IsSpecB ? "WPinternals.SB" : "WPinternals.SBA"; + string SBRes = IsSpecB ? "WPinternals.Assets.SB" : "WPinternals.Assets.SBA"; Part.Stream = new SeekableStream(() => { System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly(); diff --git a/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs b/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs index e0903ef..4e564d4 100644 --- a/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs +++ b/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs @@ -197,7 +197,7 @@ namespace WPinternals // It overwrites the variable in a different NV-partition than where this variable is stored usually. // This normally leads to endless-loops when the NV-variables are enumerated. // But the partition contains an extra hack to break out the endless loops. - Stream stream = assembly.GetManifestResourceStream("WPinternals.SB"); + Stream stream = assembly.GetManifestResourceStream("WPinternals.Assets.SB"); return new DecompressedStream(stream); }); @@ -2293,7 +2293,7 @@ namespace WPinternals // It overwrites the variable in a different NV-partition than where this variable is stored usually. // This normally leads to endless-loops when the NV-variables are enumerated. // But the partition contains an extra hack to break out the endless loops. - Stream stream = assembly.GetManifestResourceStream("WPinternals.SB"); + Stream stream = assembly.GetManifestResourceStream("WPinternals.Assets.SB"); return new DecompressedStream(stream); }); @@ -2652,7 +2652,7 @@ namespace WPinternals // It overwrites the variable in a different NV-partition than where this variable is stored usually. // This normally leads to endless-loops when the NV-variables are enumerated. // But the partition contains an extra hack to break out the endless loops. - Stream stream = assembly.GetManifestResourceStream("WPinternals.SB"); + Stream stream = assembly.GetManifestResourceStream("WPinternals.Assets.SB"); return new DecompressedStream(stream); }); diff --git a/WPinternals/ViewModels/SwitchModeViewModel.cs b/WPinternals/ViewModels/SwitchModeViewModel.cs index ed91e62..9f78ce1 100644 --- a/WPinternals/ViewModels/SwitchModeViewModel.cs +++ b/WPinternals/ViewModels/SwitchModeViewModel.cs @@ -1013,7 +1013,7 @@ namespace WPinternals // It overwrites the variable in a different NV-partition than where this variable is stored usually. // This normally leads to endless-loops when the NV-variables are enumerated. // But the partition contains an extra hack to break out the endless loops. - using (Stream stream = assembly.GetManifestResourceStream("WPinternals.SBMSM")) + using (Stream stream = assembly.GetManifestResourceStream("WPinternals.Assets.SBMSM")) { using DecompressedStream dec = new(stream); using MemoryStream SB = new(); // Must be a seekable stream! @@ -1240,7 +1240,7 @@ namespace WPinternals // It overwrites the variable in a different NV-partition than where this variable is stored usually. // This normally leads to endless-loops when the NV-variables are enumerated. // But the partition contains an extra hack to break out the endless loops. - using (Stream stream = assembly.GetManifestResourceStream("WPinternals.SBMSM")) + using (Stream stream = assembly.GetManifestResourceStream("WPinternals.Assets.SBMSM")) { using DecompressedStream dec = new(stream); using MemoryStream SB = new(); // Must be a seekable stream! @@ -1441,7 +1441,7 @@ namespace WPinternals // It overwrites the variable in a different NV-partition than where this variable is stored usually. // This normally leads to endless-loops when the NV-variables are enumerated. // But the partition contains an extra hack to break out the endless loops. - using (Stream stream = assembly.GetManifestResourceStream("WPinternals.SBMSM")) + using (Stream stream = assembly.GetManifestResourceStream("WPinternals.Assets.SBMSM")) { using DecompressedStream dec = new(stream); using MemoryStream SB = new(); // Must be a seekable stream! diff --git a/WPinternals/Views/About.xaml b/WPinternals/Views/About.xaml index 9e13ce7..c32f3a3 100644 --- a/WPinternals/Views/About.xaml +++ b/WPinternals/Views/About.xaml @@ -30,7 +30,7 @@ DEALINGS IN THE SOFTWARE. mc:Ignorable="d" d:DesignWidth="700"> - + diff --git a/WPinternals/Views/BusyView.xaml b/WPinternals/Views/BusyView.xaml index 43b787c..5a15d1b 100644 --- a/WPinternals/Views/BusyView.xaml +++ b/WPinternals/Views/BusyView.xaml @@ -30,7 +30,7 @@ DEALINGS IN THE SOFTWARE. mc:Ignorable="d" d:DesignWidth="700"> - + diff --git a/WPinternals/Views/BusyView.xaml.cs b/WPinternals/Views/BusyView.xaml.cs index f829ec4..832d61f 100644 --- a/WPinternals/Views/BusyView.xaml.cs +++ b/WPinternals/Views/BusyView.xaml.cs @@ -32,7 +32,7 @@ namespace WPinternals InitializeComponent(); // Setting these properties in XAML results in an error. Why? - GifImage.GifSource = "/aerobusy.gif"; + GifImage.GifSource = "/Assets/aerobusy.gif"; GifImage.AutoStart = true; } } diff --git a/WPinternals/Views/Empty.xaml b/WPinternals/Views/Empty.xaml index b1f4c39..ddeb0de 100644 --- a/WPinternals/Views/Empty.xaml +++ b/WPinternals/Views/Empty.xaml @@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE. d:DesignWidth="700" > - + diff --git a/WPinternals/Views/Empty.xaml.cs b/WPinternals/Views/Empty.xaml.cs index fa416d4..2cdde76 100644 --- a/WPinternals/Views/Empty.xaml.cs +++ b/WPinternals/Views/Empty.xaml.cs @@ -46,7 +46,7 @@ namespace WPinternals UIContext = SynchronizationContext.Current; // Setting these properties in XAML results in an error. Why? - GifImage.GifSource = "/aerobusy.gif"; + GifImage.GifSource = "/Assets/aerobusy.gif"; GifImage.AutoStart = true; Loaded += Empty_Loaded; diff --git a/WPinternals/Views/MainWindow.xaml b/WPinternals/Views/MainWindow.xaml index 298ecda..96935b4 100644 --- a/WPinternals/Views/MainWindow.xaml +++ b/WPinternals/Views/MainWindow.xaml @@ -23,7 +23,7 @@ DEALINGS IN THE SOFTWARE. + xmlns:local="clr-namespace:WPinternals" Height="760" Width="1150" Icon="..\Assets\WPinternals.ico" Closed="Window_Closed"> @@ -115,8 +115,8 @@ DEALINGS IN THE SOFTWARE. - - + +