Skip to content

Commit 0dbe64b

Browse files
author
Unity Technologies
committed
Unity 2017.4.25f1 C# reference source code
1 parent 117d012 commit 0dbe64b

File tree

3 files changed

+28
-20
lines changed

3 files changed

+28
-20
lines changed

‎Projects/CSharp/UnityReferenceSource.sln

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
VisualStudioVersion = 14.0.24720.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55

6-
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "Unity.CecilTools", "..\..\Tools\Unity.CecilTools\Unity.CecilTools.csproj", "{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}"
6+
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "UnityEngine", "UnityEngine.csproj", "{F0499708-3EB6-4026-8362-97E6FFC4E7C8}"
77
EndProject
8-
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "Unity.SerializationLogic", "..\..\Tools\Unity.SerializationLogic\Unity.SerializationLogic.csproj", "{A6749DFF-E369-4FE6-9019-6B7C555E80EA}"
8+
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "UnityEditor", "UnityEditor.csproj", "{016C8D73-3641-47FB-8D33-7A015A7EC7DB}"
99
EndProject
1010
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "UNetWeaver", "..\..\Extensions\Networking\Weaver\UNetWeaver.csproj", "{709222FD-15C2-497D-8B31-366ADCC074CD}"
1111
EndProject
12-
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "UnityEngine", "UnityEngine.csproj", "{F0499708-3EB6-4026-8362-97E6FFC4E7C8}"
12+
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "DataContract", "..\..\Tools\PackageManager\DataContract\DataContract.csproj", "{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}"
1313
EndProject
14-
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "UnityEditor", "UnityEditor.csproj", "{016C8D73-3641-47FB-8D33-7A015A7EC7DB}"
14+
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "Unity.CecilTools", "..\..\Tools\Unity.CecilTools\Unity.CecilTools.csproj", "{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}"
1515
EndProject
16-
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "DataContract", "..\..\Tools\PackageManager\DataContract\DataContract.csproj", "{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}"
16+
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "Unity.SerializationLogic", "..\..\Tools\Unity.SerializationLogic\Unity.SerializationLogic.csproj", "{A6749DFF-E369-4FE6-9019-6B7C555E80EA}"
1717
EndProject
1818
Global
1919
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2020
Debug|Any CPU = Debug|Any CPU
2121
Release|Any CPU = Release|Any CPU
2222
EndGlobalSection
2323
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Release|Any CPU.ActiveCfg = Debug|Any CPU
27-
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Release|Any CPU.Build.0 = Debug|Any CPU
28-
{A6749DFF-E369-4FE6-9019-6B7C555E80EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29-
{A6749DFF-E369-4FE6-9019-6B7C555E80EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{A6749DFF-E369-4FE6-9019-6B7C555E80EA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
31-
{A6749DFF-E369-4FE6-9019-6B7C555E80EA}.Release|Any CPU.Build.0 = Debug|Any CPU
32-
{709222FD-15C2-497D-8B31-366ADCC074CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{709222FD-15C2-497D-8B31-366ADCC074CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{709222FD-15C2-497D-8B31-366ADCC074CD}.Release|Any CPU.ActiveCfg = Debug|Any CPU
35-
{709222FD-15C2-497D-8B31-366ADCC074CD}.Release|Any CPU.Build.0 = Debug|Any CPU
3624
{F0499708-3EB6-4026-8362-97E6FFC4E7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3725
{F0499708-3EB6-4026-8362-97E6FFC4E7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
3826
{F0499708-3EB6-4026-8362-97E6FFC4E7C8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
@@ -41,10 +29,22 @@ Global
4129
{016C8D73-3641-47FB-8D33-7A015A7EC7DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
4230
{016C8D73-3641-47FB-8D33-7A015A7EC7DB}.Release|Any CPU.ActiveCfg = Debug|Any CPU
4331
{016C8D73-3641-47FB-8D33-7A015A7EC7DB}.Release|Any CPU.Build.0 = Debug|Any CPU
32+
{709222FD-15C2-497D-8B31-366ADCC074CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{709222FD-15C2-497D-8B31-366ADCC074CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{709222FD-15C2-497D-8B31-366ADCC074CD}.Release|Any CPU.ActiveCfg = Debug|Any CPU
35+
{709222FD-15C2-497D-8B31-366ADCC074CD}.Release|Any CPU.Build.0 = Debug|Any CPU
4436
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4537
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
4638
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Release|Any CPU.ActiveCfg = Debug|Any CPU
4739
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Release|Any CPU.Build.0 = Debug|Any CPU
40+
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Release|Any CPU.ActiveCfg = Debug|Any CPU
43+
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Release|Any CPU.Build.0 = Debug|Any CPU
44+
{A6749DFF-E369-4FE6-9019-6B7C555E80EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{A6749DFF-E369-4FE6-9019-6B7C555E80EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{A6749DFF-E369-4FE6-9019-6B7C555E80EA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
47+
{A6749DFF-E369-4FE6-9019-6B7C555E80EA}.Release|Any CPU.Build.0 = Debug|Any CPU
4848
EndGlobalSection
4949
GlobalSection(SolutionProperties) = preSolution
5050
HideSolutionNode = FALSE

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Unity 2017.4.24f1 C# reference source code
1+
## Unity 2017.4.25f1 C# reference source code
22

33
The C# part of the Unity engine and editor source code.
44
May be used for reference purposes only.

‎Runtime/TextRendering/Managed/TextGenerator.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,24 @@ public TextGenerator(int initialCapacity)
113113

114114
~TextGenerator()
115115
{
116-
((IDisposable)this).Dispose();
116+
Dispose(false);
117117
}
118118

119119
void IDisposable.Dispose()
120+
{
121+
Dispose(true);
122+
123+
GC.SuppressFinalize(this);
124+
}
125+
126+
private void Dispose(bool disposing)
120127
{
121128
lock (s_Instances)
122129
{
123130
s_Instances.Remove(m_Id);
124131
}
125-
Dispose_cpp();
132+
if (disposing)
133+
Dispose_cpp();
126134
}
127135

128136
[RequiredByNativeCode]

0 commit comments

Comments
 (0)