From a9e4ca7db04c8527d8d180a6f675e89da256ade2 Mon Sep 17 00:00:00 2001 From: David In't veld Date: Tue, 8 Aug 2023 15:10:42 +0100 Subject: [PATCH] Minor tweaks for release --- CarboCroc/CarboCroc.csproj | 1 + CarboLifeAPI/CarboLifeAPI.csproj | 6 ++---- CarboLifeCalc/img/ico_CarboLife2D16.png | Bin 3384 -> 2564 bytes CarboLifeCalc/img/ico_CarboLife2D32.png | Bin 4776 -> 3680 bytes CarboLifeRevit/CarboLifeRevit.csproj | 4 ++-- CarboLifeUI/CarboLifeUI.csproj | 4 ++-- CarboLifeUI/UI/CarboLifeMainWindow.xaml.cs | 2 +- CarboLifeUI/UI/Overview.xaml | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/CarboCroc/CarboCroc.csproj b/CarboCroc/CarboCroc.csproj index f286ece..f862e69 100644 --- a/CarboCroc/CarboCroc.csproj +++ b/CarboCroc/CarboCroc.csproj @@ -31,6 +31,7 @@ TRACE prompt 4 + x64 diff --git a/CarboLifeAPI/CarboLifeAPI.csproj b/CarboLifeAPI/CarboLifeAPI.csproj index 1c1a605..0003fd9 100644 --- a/CarboLifeAPI/CarboLifeAPI.csproj +++ b/CarboLifeAPI/CarboLifeAPI.csproj @@ -59,12 +59,10 @@ - ..\..\..\CarboLifeCalc\LiveCharts.dll - True + ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll - ..\..\..\CarboLifeCalc\LiveCharts.Wpf.dll - True + ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll diff --git a/CarboLifeCalc/img/ico_CarboLife2D16.png b/CarboLifeCalc/img/ico_CarboLife2D16.png index 80df52ef030eecb54c38bdd856f9bd43a32dfbbf..17a70d4e0a1176570bd357728fa515780a7d60c8 100644 GIT binary patch delta 1411 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 O&klPRLZxkB{C@#Us==uM diff --git a/CarboLifeRevit/CarboLifeRevit.csproj b/CarboLifeRevit/CarboLifeRevit.csproj index f1c4334..666f65f 100644 --- a/CarboLifeRevit/CarboLifeRevit.csproj +++ b/CarboLifeRevit/CarboLifeRevit.csproj @@ -11,7 +11,7 @@ Properties CarboLifeRevit CarboLifeRevit - v4.7 + v4.8 512 true @@ -53,7 +53,7 @@ TRACE true pdbonly - ARM64 + x64 prompt MinimumRecommendedRules.ruleset diff --git a/CarboLifeUI/CarboLifeUI.csproj b/CarboLifeUI/CarboLifeUI.csproj index 5414d91..1e26355 100644 --- a/CarboLifeUI/CarboLifeUI.csproj +++ b/CarboLifeUI/CarboLifeUI.csproj @@ -61,11 +61,11 @@ Resources\ico_CarboLife.ico - + ..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll - ..\..\..\CarboLifeCalc\LiveCharts.Wpf.dll + ..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll diff --git a/CarboLifeUI/UI/CarboLifeMainWindow.xaml.cs b/CarboLifeUI/UI/CarboLifeMainWindow.xaml.cs index 4569655..5c44e2d 100644 --- a/CarboLifeUI/UI/CarboLifeMainWindow.xaml.cs +++ b/CarboLifeUI/UI/CarboLifeMainWindow.xaml.cs @@ -622,7 +622,7 @@ private void Window_Loaded(object sender, RoutedEventArgs e) System.Drawing.Rectangle resolution = System.Windows.Forms.Screen.PrimaryScreen.Bounds; int height = resolution.Height; - if(height > 744) + if(height > 768) { this.Height = (height - 100); diff --git a/CarboLifeUI/UI/Overview.xaml b/CarboLifeUI/UI/Overview.xaml index dfd89c6..7de5308 100644 --- a/CarboLifeUI/UI/Overview.xaml +++ b/CarboLifeUI/UI/Overview.xaml @@ -22,7 +22,7 @@ - +