Minor tweaks for release

DavidVeld · Aug 8, 2023 · a9e4ca7 · a9e4ca7
1 parent 68bee5e
commit a9e4ca7
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/CarboCroc/CarboCroc.csproj b/CarboCroc/CarboCroc.csproj
@@ -31,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="GH_IO">

diff --git a/CarboLifeAPI/CarboLifeAPI.csproj b/CarboLifeAPI/CarboLifeAPI.csproj
@@ -59,12 +59,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="LiveCharts">
-      <HintPath>..\..\..\CarboLifeCalc\LiveCharts.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll</HintPath>
     </Reference>
     <Reference Include="LiveCharts.Wpf">
-      <HintPath>..\..\..\CarboLifeCalc\LiveCharts.Wpf.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

diff --git a/CarboLifeCalc/img/ico_CarboLife2D16.png b/CarboLifeCalc/img/ico_CarboLife2D16.png
diff --git a/CarboLifeCalc/img/ico_CarboLife2D32.png b/CarboLifeCalc/img/ico_CarboLife2D32.png
diff --git a/CarboLifeRevit/CarboLifeRevit.csproj b/CarboLifeRevit/CarboLifeRevit.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CarboLifeRevit</RootNamespace>
     <AssemblyName>CarboLifeRevit</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -53,7 +53,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM64</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>

diff --git a/CarboLifeUI/CarboLifeUI.csproj b/CarboLifeUI/CarboLifeUI.csproj
@@ -61,11 +61,11 @@
     <ApplicationIcon>Resources\ico_CarboLife.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LiveCharts, Version=0.9.7.0, Culture=neutral, PublicKeyToken=0bc1f845d1ebb8df, processorArchitecture=MSIL">
+    <Reference Include="LiveCharts">
       <HintPath>..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll</HintPath>
     </Reference>
     <Reference Include="LiveCharts.Wpf">
-      <HintPath>..\..\..\CarboLifeCalc\LiveCharts.Wpf.dll</HintPath>
+      <HintPath>..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

diff --git 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
@@ -22,7 +22,7 @@
             <RowDefinition Height="30"/>
             <RowDefinition Height="0.8*"/>
             <RowDefinition Height="30"/>
-            <RowDefinition Height="330"/>
+            <RowDefinition Height="340"/>
             <RowDefinition Height="5"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>