Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "ADDON BINDER: Cannot resolve assembly" errors in log #357

Open
wants to merge 3 commits into
base: release
Choose a base branch
from
Open

Fix "ADDON BINDER: Cannot resolve assembly" errors in log #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d37527
Add KSPAssembly and KSPAssemblyDependency stanzas to ensure KSP can l…
mwerle Nov 18, 2019
b7ce483
Fix HSVPicker after adding "Assembly-CSharp" reference which clashes …
mwerle Nov 18, 2019
97c0962
Fix Assembly-CSharp HintPath to match upstream in SCANsat.Unity proje…
mwerle Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SCANsat.Unity/HSVPicker/Enums/ColorValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace SCANsat.Unity.HSVPicker.Enum
namespace SCANsat.Unity.HSVPicker
{
public enum ColorValues
{
Expand Down
2 changes: 1 addition & 1 deletion SCANsat.Unity/HSVPicker/Events/ColorChangedEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System;
using UnityEngine.Events;

namespace SCANsat.Unity.HSVPicker.Events
namespace SCANsat.Unity.HSVPicker
{
[Serializable]
public class ColorChangedEvent : UnityEvent<Color>
Expand Down
2 changes: 1 addition & 1 deletion SCANsat.Unity/HSVPicker/Events/HSVChangedEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using UnityEngine;
using UnityEngine.Events;

namespace SCANsat.Unity.HSVPicker.Events
namespace SCANsat.Unity.HSVPicker
{
public class HSVChangedEvent : UnityEvent<float, float, float>
{
Expand Down
2 changes: 1 addition & 1 deletion SCANsat.Unity/HSVPicker/UI/ColorImage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UnityEngine.UI;
using System.Collections;

namespace SCANsat.Unity.HSVPicker.UI
namespace SCANsat.Unity.HSVPicker
{
[RequireComponent(typeof(Image))]
public class ColorImage : MonoBehaviour
Expand Down
3 changes: 1 addition & 2 deletions SCANsat.Unity/HSVPicker/UI/ColorInput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using UnityEngine;
using UnityEngine.UI;
using System;
using SCANsat.Unity.HSVPicker.Enum;

namespace SCANsat.Unity.HSVPicker.UI
namespace SCANsat.Unity.HSVPicker
{
/// <summary>
/// Displays one of the color values of aColorPicker
Expand Down
3 changes: 1 addition & 2 deletions SCANsat.Unity/HSVPicker/UI/ColorLabel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using UnityEngine;
using UnityEngine.UI;
using System;
using SCANsat.Unity.HSVPicker.Enum;

namespace SCANsat.Unity.HSVPicker.UI
namespace SCANsat.Unity.HSVPicker
{
[RequireComponent(typeof(TextHandler))]
public class ColorLabel : MonoBehaviour
Expand Down
5 changes: 1 addition & 4 deletions SCANsat.Unity/HSVPicker/UI/ColorPicker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@
using System.Collections;
using UnityEngine.UI;
using UnityEngine.Events;
using SCANsat.Unity.HSVPicker.Utility;
using SCANsat.Unity.HSVPicker.Enum;
using SCANsat.Unity.HSVPicker.Events;

namespace SCANsat.Unity.HSVPicker.UI
namespace SCANsat.Unity.HSVPicker
{
public class ColorPicker : MonoBehaviour
{
Expand Down
3 changes: 1 addition & 2 deletions SCANsat.Unity/HSVPicker/UI/ColorSlider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using UnityEngine;
using UnityEngine.UI;
using System;
using SCANsat.Unity.HSVPicker.Enum;

namespace SCANsat.Unity.HSVPicker.UI
namespace SCANsat.Unity.HSVPicker
{
/// <summary>
/// Displays one of the color values of aColorPicker
Expand Down
4 changes: 1 addition & 3 deletions SCANsat.Unity/HSVPicker/UI/ColorSliderImage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using UnityEngine;
using UnityEngine.UI;
using System.Collections;
using SCANsat.Unity.HSVPicker.Enum;
using SCANsat.Unity.HSVPicker.Utility;

namespace SCANsat.Unity.HSVPicker.UI
namespace SCANsat.Unity.HSVPicker
{
[RequireComponent(typeof(RawImage)), ExecuteInEditMode()]
public class ColorSliderImage : MonoBehaviour
Expand Down
4 changes: 1 addition & 3 deletions SCANsat.Unity/HSVPicker/UI/SVBoxSlider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using UnityEngine;
using UnityEngine.UI;
using System.Collections;
using SCANsat.Unity.HSVPicker.Utility;
using SCANsat.Unity.HSVPicker.Enum;

namespace SCANsat.Unity.HSVPicker.UI
namespace SCANsat.Unity.HSVPicker
{
[RequireComponent(typeof(BoxSlider), typeof(RawImage)), ExecuteInEditMode()]
public class SVBoxSlider : MonoBehaviour
Expand Down
2 changes: 1 addition & 1 deletion SCANsat.Unity/HSVPicker/UtilityScripts/BoxSlider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using UnityEngine.Events;
using UnityEngine.EventSystems;

namespace SCANsat.Unity.HSVPicker.Utility
namespace SCANsat.Unity.HSVPicker
{
[AddComponentMenu("UI/BoxSlider", 35)]
[RequireComponent(typeof(RectTransform))]
Expand Down
2 changes: 1 addition & 1 deletion SCANsat.Unity/HSVPicker/UtilityScripts/HSVUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Collections.Generic;
using System;

namespace SCANsat.Unity.HSVPicker.Utility
namespace SCANsat.Unity.HSVPicker
{
#region ColorUtilities

Expand Down
4 changes: 3 additions & 1 deletion SCANsat.Unity/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

Expand All @@ -24,3 +24,5 @@

[assembly: AssemblyVersion("1.8.14.0")]
[assembly: AssemblyFileVersion("1.8.14.0")]

[assembly: KSPAssembly("SCANsat.Unity", 1, 0)]
9 changes: 4 additions & 5 deletions SCANsat.Unity/SCAN_ColorPicker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,15 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using SCANsat.Unity.HSVPicker.UI;

namespace SCANsat.Unity
{
public class SCAN_ColorPicker : MonoBehaviour
{
[SerializeField]
private ColorImage m_ColorOne = null;
private HSVPicker.ColorImage m_ColorOne = null;
[SerializeField]
private ColorImage m_ColorTwo = null;
private HSVPicker.ColorImage m_ColorTwo = null;
[SerializeField]
private Image m_OldColorOne = null;
[SerializeField]
Expand All @@ -36,7 +35,7 @@ public class SCAN_ColorPicker : MonoBehaviour
[SerializeField]
private InputHandler m_BInputField = null;

private ColorPicker picker;
private HSVPicker.ColorPicker picker;

private bool anyInputActive;

Expand All @@ -57,7 +56,7 @@ public bool AnyInputActive

private void Awake()
{
picker = GetComponent<ColorPicker>();
picker = GetComponent<HSVPicker.ColorPicker>();
}

private void Update()
Expand Down
4 changes: 4 additions & 0 deletions SCANsat.Unity/SCANsat.Unity.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="UnityEngine">
<HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
Expand Down
1 change: 0 additions & 1 deletion SCANsat.Unity/Unity/SCAN_ColorAltimetry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using UnityEngine.Events;
using UnityEngine.EventSystems;
using SCANsat.Unity.Interfaces;
using SCANsat.Unity.HSVPicker.UI;

namespace SCANsat.Unity.Unity
{
Expand Down
1 change: 0 additions & 1 deletion SCANsat.Unity/Unity/SCAN_ColorBiome.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using UnityEngine.Events;
using UnityEngine.EventSystems;
using SCANsat.Unity.Interfaces;
using SCANsat.Unity.HSVPicker.UI;

namespace SCANsat.Unity.Unity
{
Expand Down
1 change: 0 additions & 1 deletion SCANsat.Unity/Unity/SCAN_ColorResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using UnityEngine.Events;
using UnityEngine.EventSystems;
using SCANsat.Unity.Interfaces;
using SCANsat.Unity.HSVPicker.UI;

namespace SCANsat.Unity.Unity
{
Expand Down
1 change: 0 additions & 1 deletion SCANsat.Unity/Unity/SCAN_ColorSlope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using UnityEngine.Events;
using UnityEngine.EventSystems;
using SCANsat.Unity.Interfaces;
using SCANsat.Unity.HSVPicker.UI;

namespace SCANsat.Unity.Unity
{
Expand Down
3 changes: 1 addition & 2 deletions SCANsat/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@
[assembly: AssemblyInformationalVersion ("v18.14")]

[assembly: KSPAssembly ("SCANsat", 1, 8)]


[assembly: KSPAssemblyDependency("SCANsat.Unity", 1, 0)]