Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit e554673

Browse files
committed
Fix building without access to internal stuff
1 parent 1c356ef commit e554673

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

common/properties.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<!-- Build flags -->
44
<PropertyGroup>
55
<BuildType Condition="Exists('$(SolutionDir)script\src\MetricsService.cs')">Internal</BuildType>
6+
<BuildDefs Condition="Exists('$(SolutionDir)script\src\MetricsService.cs')">ENABLE_METRICS</BuildDefs>
67

78
<UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\script\lib\UnityEditor.dll')">$(SolutionDir)\script\lib\</UnityDir>
89
<UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\lib\UnityEditor.dll')">$(SolutionDir)\lib\</UnityDir>

src/GitHub.Api/Application/ApplicationManagerBase.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
174174
id = Guid.NewGuid().ToString();
175175
UserSettings.Set(Constants.GuidKey, id);
176176
}
177-
/*
177+
178+
#if ENABLE_METRICS
178179
var metricsService = new MetricsService(ProcessManager,
179180
TaskManager,
180181
Environment.FileSystem,
@@ -187,7 +188,7 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
187188
{
188189
UsageTracker.IncrementLaunchCount();
189190
}
190-
*/
191+
#endif
191192
}
192193

193194
protected abstract void SetupMetrics();

src/GitHub.Api/GitHub.Api.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DebugSymbols>true</DebugSymbols>
2323
<DebugType>full</DebugType>
2424
<Optimize>false</Optimize>
25-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25+
<DefineConstants>DEBUG;TRACE;$(BuildDefs)</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
2828
<RunCodeAnalysis>true</RunCodeAnalysis>
@@ -32,7 +32,7 @@
3232
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3333
<DebugType>pdbonly</DebugType>
3434
<Optimize>true</Optimize>
35-
<DefineConstants>TRACE</DefineConstants>
35+
<DefineConstants>TRACE;$(BuildDefs)</DefineConstants>
3636
<ErrorReport>prompt</ErrorReport>
3737
<WarningLevel>4</WarningLevel>
3838
<BuildConfid>Release</BuildConfid>
@@ -44,7 +44,7 @@
4444
<DebugSymbols>true</DebugSymbols>
4545
<DebugType>full</DebugType>
4646
<Optimize>false</Optimize>
47-
<DefineConstants>TRACE;DEBUG;DEVELOPER_BUILD</DefineConstants>
47+
<DefineConstants>TRACE;DEBUG;DEVELOPER_BUILD;$(BuildDefs)</DefineConstants>
4848
<ErrorReport>prompt</ErrorReport>
4949
<WarningLevel>4</WarningLevel>
5050
<RunCodeAnalysis>false</RunCodeAnalysis>

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ private void MaybeUpdateData()
166166
{
167167
if (metricsHasChanged)
168168
{
169-
//metricsEnabled = Manager.UsageTracker.Enabled;
169+
metricsEnabled = Manager.UsageTracker != null ? Manager.UsageTracker.Enabled : false;
170170
metricsHasChanged = false;
171171
}
172172

@@ -311,7 +311,7 @@ private void OnPrivacyGui()
311311
{
312312
GUILayout.Label(PrivacyTitle, EditorStyles.boldLabel);
313313

314-
EditorGUI.BeginDisabledGroup(IsBusy);
314+
EditorGUI.BeginDisabledGroup(IsBusy && Manager.UsageTracker != null);
315315
{
316316

317317
EditorGUI.BeginChangeCheck();
@@ -320,7 +320,8 @@ private void OnPrivacyGui()
320320
}
321321
if (EditorGUI.EndChangeCheck())
322322
{
323-
Manager.UsageTracker.Enabled = metricsEnabled;
323+
if (Manager.UsageTracker != null)
324+
Manager.UsageTracker.Enabled = metricsEnabled;
324325
}
325326
}
326327
EditorGUI.EndDisabledGroup();

0 commit comments

Comments
 (0)