update for 1.0.5

OpenLoco · Jul 18, 2024 · f240085 · f240085
1 parent 1656224
commit f240085
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/AvaGui/AvaGui.csproj b/AvaGui/AvaGui.csproj
@@ -8,6 +8,15 @@
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <StartupObject>AvaGui.Program</StartupObject>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RepositoryUrl>https://github.com/OpenLoco/OpenLocoObjectEditor</RepositoryUrl>
+    <AssemblyVersion>1.0.5</AssemblyVersion>
+    <FileVersion>$(AssemblyVersion)</FileVersion>
+    <AssemblyName>ObjectEditor</AssemblyName>
+    <Product>$(AssemblyName) $(AssemblyVersion)</Product>
+    <Version>$(AssemblyVersion)</Version>
+    <Authors>LeftofZen</Authors>
+    <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,7 +31,6 @@
     <EmbeddedResource Include="version.txt" />
   </ItemGroup>
 
-
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="11.0.11" />
     <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.11" />
@@ -39,13 +47,11 @@
     <PackageReference Include="Zenith.Core" Version="1.0.20" />
   </ItemGroup>
 
-
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
     <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 
-
   <ItemGroup>
     <Compile Update="Views\VehicleView.axaml.cs">
       <DependentUpon>VehicleView.axaml</DependentUpon>

diff --git a/AvaGui/ViewModels/MainWindowViewModel.cs b/AvaGui/ViewModels/MainWindowViewModel.cs
@@ -79,7 +79,7 @@ public class MainWindowViewModel : ViewModelBase
 
 		public MainWindowViewModel()
 		{
-			var paletteUri = new Uri("avares://AvaGui/Assets/palette.png");
+			var paletteUri = new Uri("avares://ObjectEditor/Assets/palette.png");
 			var palette = Image.Load<Rgb24>(AssetLoader.Open(paletteUri));
 
 			Model = new()

diff --git a/AvaGui/Views/MainWindow.axaml b/AvaGui/Views/MainWindow.axaml
@@ -25,7 +25,7 @@
 			<StackPanel Orientation="Horizontal">
 				<Image Width="32" Height="32">
 					<Image.Source>
-						<CroppedBitmap Source="avares://AvaGui/Assets/loco_object_types_combined.png" SourceRect="{Binding SourceRect}">
+						<CroppedBitmap Source="avares://ObjectEditor/Assets/loco_object_types_combined.png" SourceRect="{Binding SourceRect}">
 						</CroppedBitmap>
 					</Image.Source>
 				</Image>
@@ -37,7 +37,7 @@
 			<StackPanel Orientation="Horizontal">
 				<Image Width="32" Height="32">
 					<Image.Source>
-						<CroppedBitmap Source="avares://AvaGui/Assets/loco_vehicle_types_combined.png" SourceRect="{Binding SourceRect}">
+						<CroppedBitmap Source="avares://ObjectEditor/Assets/loco_vehicle_types_combined.png" SourceRect="{Binding SourceRect}">
 						</CroppedBitmap>
 					</Image.Source>
 				</Image>
@@ -49,7 +49,7 @@
 			<StackPanel Orientation="Horizontal">
 				<Image Width="16" Height="16">
 					<Image.Source>
-						<CroppedBitmap Source="avares://AvaGui/Assets/vanilla.png" SourceRect="{Binding SourceRect}">
+						<CroppedBitmap Source="avares://ObjectEditor/Assets/vanilla.png" SourceRect="{Binding SourceRect}">
 						</CroppedBitmap>
 					</Image.Source>
 				</Image>

diff --git a/AvaGui/version.txt b/AvaGui/version.txt
@@ -1 +1 @@
-1.0.4
+1.0.5
diff --git a/Gui/Gui.csproj b/Gui/Gui.csproj
@@ -11,12 +11,12 @@
     <StartupObject>OpenLoco.ObjectEditor.Gui.Program</StartupObject>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/OpenLoco/OpenLocoObjectEditor</RepositoryUrl>
-    <AssemblyVersion>1.0.4</AssemblyVersion>
+    <AssemblyVersion>1.0.5</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
     <AssemblyName>ObjectEditor</AssemblyName>
-    <Authors>LeftofZen</Authors>
     <Product>$(AssemblyName) $(AssemblyVersion)</Product>
     <Version>$(AssemblyVersion)</Version>
+    <Authors>LeftofZen</Authors>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
   </PropertyGroup>
 

diff --git a/Gui/version.txt b/Gui/version.txt
@@ -1 +1 @@
-1.0.4
+1.0.5