Skip to content

Commit 3e50b16

Browse files
author
Fraser Greenroyd
committed
Merge branch 'BHoM_UI-#215-Settings' of https://github.com/BHoM/BHoM_UI into BHoM_UI-#215-Settings
2 parents 6f76fc4 + c4f86e8 commit 3e50b16

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

BHoM_Windows_UI/BHoM_Windows_UI.csproj

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -25,22 +25,28 @@
2525
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2626
<DebugType>pdbonly</DebugType>
2727
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
28+
<OutputPath>..\Build\</OutputPath>
2929
<DefineConstants>TRACE</DefineConstants>
3030
<ErrorReport>prompt</ErrorReport>
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="BHoM">
35-
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
35+
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
36+
<Private>False</Private>
37+
<SpecificVersion>False</SpecificVersion>
3638
</Reference>
3739
<Reference Include="BHoM_Engine">
38-
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
40+
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
41+
<Private>False</Private>
42+
<SpecificVersion>False</SpecificVersion>
3943
</Reference>
4044
<Reference Include="PresentationCore" />
4145
<Reference Include="PresentationFramework" />
4246
<Reference Include="Settings_Engine">
43-
<HintPath>..\..\..\..\..\..\..\ProgramData\BHoM\Assemblies\Settings_Engine.dll</HintPath>
47+
<HintPath>$(ProgramData)\BHoM\Assemblies\Settings_Engine.dll</HintPath>
48+
<Private>False</Private>
49+
<SpecificVersion>False</SpecificVersion>
4450
</Reference>
4551
<Reference Include="System" />
4652
<Reference Include="System.Core" />
@@ -92,4 +98,4 @@
9298
<PropertyGroup>
9399
<PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)" "$(ProgramData)\BHoM\Assemblies" /Y</PostBuildEvent>
94100
</PropertyGroup>
95-
</Project>
101+
</Project>

BHoM_Windows_UI/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using System.Reflection;
1+
using System.Reflection;
22
using System.Runtime.CompilerServices;
33
using System.Runtime.InteropServices;
44

55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("BHoM_Windows_UI")]
9-
[assembly: AssemblyDescription("")]
9+
[assembly: AssemblyDescription("https://github.com/BHoM/BHoM_UI")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("BuroHappold Engineering")]
1212
[assembly: AssemblyProduct("BHoM_Windows_UI")]
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("7.0.0.0")]
36+
[assembly: AssemblyFileVersion("7.1.0.0")]

UI_oM/UI_oM.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -32,12 +32,12 @@
3232
<ItemGroup>
3333
<Reference Include="BHoM">
3434
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
35+
<HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
3636
<Private>False</Private>
3737
</Reference>
3838
<Reference Include="Geometry_oM">
3939
<SpecificVersion>False</SpecificVersion>
40-
<HintPath>C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll</HintPath>
40+
<HintPath>$(ProgramData)\BHoM\Assemblies\Geometry_oM.dll</HintPath>
4141
<Private>False</Private>
4242
</Reference>
4343
<Reference Include="System" />
@@ -89,4 +89,4 @@
8989
<Target Name="AfterBuild">
9090
</Target>
9191
-->
92-
</Project>
92+
</Project>

0 commit comments

Comments
 (0)