Skip to content

Commit 6aec9cd

Browse files
ClearScript 7.1: Split out ClearScript.Windows.Core from ClearScript.Windows; added "core" Windows Script engine classes that don't require the Windows Desktop runtime; added support for Windows and Linux on arm64 hardware (GitHub Issue ClearFoundry#206); enabled the JavaScript Internationalization API in V8ScriptEngine (GitHub Issue ClearFoundry#150); added V8Runtime.WriteHeapSnapshot and V8ScriptEngine.WriteRuntimeHeapSnapshot (GitHub Issue ClearFoundry#85); switched to static linking of C/C++ libraries to broaden Linux support (GitHub Issue ClearFoundry#215); relaxed type comparison in HostTypeCollection (GitHub Issue ClearFoundry#213); added experimental support for the Universal Windows Platform (V8 only); updated API and build documentation. Tested with V8 8.8.278.14.
1 parent d059bea commit 6aec9cd

File tree

781 files changed

+16691
-9210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

781 files changed

+16691
-9210
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ V8/build/
3636
.vs/
3737
packages/
3838
NuGet/Private/
39+
[Bb]undle[Aa]rtifacts/

ClearScript.NoV8.sln.DotSettings

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<s:Boolean x:Key="/Default/CodeInspection/Highlighting/CalculateUnusedTypeMembers/@EntryValue">False</s:Boolean>
44
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeThisQualifier/@EntryIndexedValue">SUGGESTION</s:String>
55
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">DO_NOT_SHOW</s:String>
6+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckNamespace/@EntryIndexedValue">DO_NOT_SHOW</s:String>
67
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
78
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
89
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JsPathNotFound/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -17,6 +18,7 @@
1718
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=COM/@EntryIndexedValue">COM</s:String>
1819
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DOM/@EntryIndexedValue">DOM</s:String>
1920
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
21+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ICU/@EntryIndexedValue">ICU</s:String>
2022
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
2123
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
2224
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JS/@EntryIndexedValue">JS</s:String>
@@ -66,6 +68,7 @@
6668
<s:Boolean x:Key="/Default/UserDictionary/Words/=HOSTEXCEPTION/@EntryIndexedValue">True</s:Boolean>
6769
<s:Boolean x:Key="/Default/UserDictionary/Words/=HRESULT/@EntryIndexedValue">True</s:Boolean>
6870
<s:Boolean x:Key="/Default/UserDictionary/Words/=hwnd/@EntryIndexedValue">True</s:Boolean>
71+
<s:Boolean x:Key="/Default/UserDictionary/Words/=icudtl/@EntryIndexedValue">True</s:Boolean>
6972
<s:Boolean x:Key="/Default/UserDictionary/Words/=instanceof/@EntryIndexedValue">True</s:Boolean>
7073
<s:Boolean x:Key="/Default/UserDictionary/Words/=INVALIDARG/@EntryIndexedValue">True</s:Boolean>
7174
<s:Boolean x:Key="/Default/UserDictionary/Words/=Invocability/@EntryIndexedValue">True</s:Boolean>

ClearScript.sln

Lines changed: 66 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29418.71
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptTest", "NetFramework\ClearScriptTest\ClearScriptTest.csproj", "{EDC7144E-FDA9-4CC7-B2CD-B5EBFD610A7D}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScriptTest", "NetFramework\ClearScriptTest\ClearScriptTest.csproj", "{EDC7144E-FDA9-4CC7-B2CD-B5EBFD610A7D}"
77
ProjectSection(ProjectDependencies) = postProject
88
{28980C99-77E7-4B62-8484-AF06C5745B8C} = {28980C99-77E7-4B62-8484-AF06C5745B8C}
99
EndProjectSection
1010
EndProject
11-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptConsole", "NetFramework\ClearScriptConsole\ClearScriptConsole.csproj", "{28980C99-77E7-4B62-8484-AF06C5745B8C}"
11+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScriptConsole", "NetFramework\ClearScriptConsole\ClearScriptConsole.csproj", "{28980C99-77E7-4B62-8484-AF06C5745B8C}"
1212
EndProject
1313
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5488F9BE-286E-459B-8384-E9EDA331BD5B}"
1414
ProjectSection(SolutionItems) = preProject
@@ -21,7 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2121
Version.tt = Version.tt
2222
EndProjectSection
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScriptBenchmarks", "NetFramework\ClearScriptBenchmarks\ClearScriptBenchmarks.csproj", "{7922A2F5-3585-4A60-98FB-1BDB4D5ECD29}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScriptBenchmarks", "NetFramework\ClearScriptBenchmarks\ClearScriptBenchmarks.csproj", "{7922A2F5-3585-4A60-98FB-1BDB4D5ECD29}"
2525
EndProject
2626
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Core", ".NET Core", "{38987D23-2ED7-473A-9DE5-863E338EF18A}"
2727
EndProject
@@ -49,16 +49,26 @@ EndProject
4949
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClearScriptV8", "ClearScriptV8", "{46C568CE-BA46-498F-9D8F-6293DED1BB94}"
5050
EndProject
5151
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClearScriptV8.win-x86", "ClearScriptV8\win-x86\ClearScriptV8.win-x86.vcxproj", "{2D63EA35-BA9C-4E77-B5A4-4938DBBFEFA6}"
52+
ProjectSection(ProjectDependencies) = postProject
53+
{7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD} = {7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD}
54+
EndProjectSection
5255
EndProject
5356
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClearScriptV8.win-x64", "ClearScriptV8\win-x64\ClearScriptV8.win-x64.vcxproj", "{CDCF4EEA-1CA4-412E-8C77-78893A67A577}"
57+
ProjectSection(ProjectDependencies) = postProject
58+
{7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD} = {7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD}
59+
EndProjectSection
5460
EndProject
55-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Core", "NetFramework\ClearScript.Core\ClearScript.Core.csproj", "{F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2}"
61+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Core", "NetFramework\ClearScript.Core\ClearScript.Core.csproj", "{F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2}"
5662
EndProject
57-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Windows", "NetFramework\ClearScript.Windows\ClearScript.Windows.csproj", "{BC560FF8-AB7A-4DA9-A1FD-99221447D370}"
63+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows", "NetFramework\ClearScript.Windows\ClearScript.Windows.csproj", "{BC560FF8-AB7A-4DA9-A1FD-99221447D370}"
64+
ProjectSection(ProjectDependencies) = postProject
65+
{5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A} = {5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A}
66+
EndProjectSection
5867
EndProject
59-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.V8", "NetFramework\ClearScript.V8\ClearScript.V8.csproj", "{59CC81A3-3D97-469A-9C8B-533F920085F1}"
68+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.V8", "NetFramework\ClearScript.V8\ClearScript.V8.csproj", "{59CC81A3-3D97-469A-9C8B-533F920085F1}"
6069
ProjectSection(ProjectDependencies) = postProject
6170
{2D63EA35-BA9C-4E77-B5A4-4938DBBFEFA6} = {2D63EA35-BA9C-4E77-B5A4-4938DBBFEFA6}
71+
{725B6D7A-ECC7-4A28-AF52-B1CB22C37134} = {725B6D7A-ECC7-4A28-AF52-B1CB22C37134}
6272
{CDCF4EEA-1CA4-412E-8C77-78893A67A577} = {CDCF4EEA-1CA4-412E-8C77-78893A67A577}
6373
EndProjectSection
6474
EndProject
@@ -95,6 +105,31 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScriptTest", "Unix\Cle
95105
{3CD8AB65-BA34-4BB9-862F-D31CE861560F} = {3CD8AB65-BA34-4BB9-862F-D31CE861560F}
96106
EndProjectSection
97107
EndProject
108+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClearScriptV8.win-arm64", "ClearScriptV8\win-arm64\ClearScriptV8.win-arm64.vcxproj", "{725B6D7A-ECC7-4A28-AF52-B1CB22C37134}"
109+
ProjectSection(ProjectDependencies) = postProject
110+
{7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD} = {7B3EA81F-F60B-46DB-B3F0-22F68E8A8FAD}
111+
EndProjectSection
112+
EndProject
113+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UWP", "UWP", "{DAF9D89A-5A6E-4450-8DA5-DFD73F26DDF5}"
114+
EndProject
115+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.Core", "UWP\ClearScript.Core\ClearScript.Core.csproj", "{D3391831-65CE-4C1E-A21B-01A283F3E193}"
116+
ProjectSection(ProjectDependencies) = postProject
117+
{F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2} = {F1022C3F-AFBC-4F23-B4DE-C6C0742AEFF2}
118+
EndProjectSection
119+
EndProject
120+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScript.V8", "UWP\ClearScript.V8\ClearScript.V8.csproj", "{CF1FD52F-A933-48D9-92A4-A39565896A42}"
121+
ProjectSection(ProjectDependencies) = postProject
122+
{D3391831-65CE-4C1E-A21B-01A283F3E193} = {D3391831-65CE-4C1E-A21B-01A283F3E193}
123+
{59CC81A3-3D97-469A-9C8B-533F920085F1} = {59CC81A3-3D97-469A-9C8B-533F920085F1}
124+
EndProjectSection
125+
EndProject
126+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows.Core", "NetCore\ClearScript.Windows.Core\ClearScript.Windows.Core.csproj", "{B9C99091-E616-4DC2-A711-4DCDAC602E38}"
127+
ProjectSection(ProjectDependencies) = postProject
128+
{5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A} = {5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A}
129+
EndProjectSection
130+
EndProject
131+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClearScript.Windows.Core", "NetFramework\ClearScript.Windows.Core\ClearScript.Windows.Core.csproj", "{5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A}"
132+
EndProject
98133
Global
99134
GlobalSection(SolutionConfigurationPlatforms) = preSolution
100135
Debug|Any CPU = Debug|Any CPU
@@ -169,6 +204,26 @@ Global
169204
{052E036D-6D60-4FCA-AA8E-4CF56BC2058D}.Debug|Any CPU.Build.0 = Debug|Any CPU
170205
{052E036D-6D60-4FCA-AA8E-4CF56BC2058D}.Release|Any CPU.ActiveCfg = Release|Any CPU
171206
{052E036D-6D60-4FCA-AA8E-4CF56BC2058D}.Release|Any CPU.Build.0 = Release|Any CPU
207+
{725B6D7A-ECC7-4A28-AF52-B1CB22C37134}.Debug|Any CPU.ActiveCfg = Debug|arm64
208+
{725B6D7A-ECC7-4A28-AF52-B1CB22C37134}.Debug|Any CPU.Build.0 = Debug|arm64
209+
{725B6D7A-ECC7-4A28-AF52-B1CB22C37134}.Release|Any CPU.ActiveCfg = Release|arm64
210+
{725B6D7A-ECC7-4A28-AF52-B1CB22C37134}.Release|Any CPU.Build.0 = Release|arm64
211+
{D3391831-65CE-4C1E-A21B-01A283F3E193}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
212+
{D3391831-65CE-4C1E-A21B-01A283F3E193}.Debug|Any CPU.Build.0 = Debug|Any CPU
213+
{D3391831-65CE-4C1E-A21B-01A283F3E193}.Release|Any CPU.ActiveCfg = Release|Any CPU
214+
{D3391831-65CE-4C1E-A21B-01A283F3E193}.Release|Any CPU.Build.0 = Release|Any CPU
215+
{CF1FD52F-A933-48D9-92A4-A39565896A42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
216+
{CF1FD52F-A933-48D9-92A4-A39565896A42}.Debug|Any CPU.Build.0 = Debug|Any CPU
217+
{CF1FD52F-A933-48D9-92A4-A39565896A42}.Release|Any CPU.ActiveCfg = Release|Any CPU
218+
{CF1FD52F-A933-48D9-92A4-A39565896A42}.Release|Any CPU.Build.0 = Release|Any CPU
219+
{B9C99091-E616-4DC2-A711-4DCDAC602E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
220+
{B9C99091-E616-4DC2-A711-4DCDAC602E38}.Debug|Any CPU.Build.0 = Debug|Any CPU
221+
{B9C99091-E616-4DC2-A711-4DCDAC602E38}.Release|Any CPU.ActiveCfg = Release|Any CPU
222+
{B9C99091-E616-4DC2-A711-4DCDAC602E38}.Release|Any CPU.Build.0 = Release|Any CPU
223+
{5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
224+
{5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A}.Debug|Any CPU.Build.0 = Debug|Any CPU
225+
{5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A}.Release|Any CPU.ActiveCfg = Release|Any CPU
226+
{5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A}.Release|Any CPU.Build.0 = Release|Any CPU
172227
EndGlobalSection
173228
GlobalSection(SolutionProperties) = preSolution
174229
HideSolutionNode = FALSE
@@ -191,6 +246,11 @@ Global
191246
{FDFA67F7-AEE6-407A-BF94-ACAD3D735CAB} = {48C9730D-CA6C-47ED-B72C-DB9B6EE24D47}
192247
{3CD8AB65-BA34-4BB9-862F-D31CE861560F} = {48C9730D-CA6C-47ED-B72C-DB9B6EE24D47}
193248
{052E036D-6D60-4FCA-AA8E-4CF56BC2058D} = {48C9730D-CA6C-47ED-B72C-DB9B6EE24D47}
249+
{725B6D7A-ECC7-4A28-AF52-B1CB22C37134} = {46C568CE-BA46-498F-9D8F-6293DED1BB94}
250+
{D3391831-65CE-4C1E-A21B-01A283F3E193} = {DAF9D89A-5A6E-4450-8DA5-DFD73F26DDF5}
251+
{CF1FD52F-A933-48D9-92A4-A39565896A42} = {DAF9D89A-5A6E-4450-8DA5-DFD73F26DDF5}
252+
{B9C99091-E616-4DC2-A711-4DCDAC602E38} = {38987D23-2ED7-473A-9DE5-863E338EF18A}
253+
{5FF9CB8B-BC95-44AB-B254-CEB4ADF4A53A} = {526BA3EF-4E1D-48C1-9923-2485B63993EE}
194254
EndGlobalSection
195255
GlobalSection(ExtensibilityGlobals) = postSolution
196256
SolutionGuid = {3BAF1393-35E4-45F1-AC56-4A22646B56E5}

ClearScript.sln.DotSettings

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<s:Boolean x:Key="/Default/CodeInspection/Highlighting/CalculateUnusedTypeMembers/@EntryValue">False</s:Boolean>
44
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeThisQualifier/@EntryIndexedValue">SUGGESTION</s:String>
55
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">DO_NOT_SHOW</s:String>
6+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckNamespace/@EntryIndexedValue">DO_NOT_SHOW</s:String>
67
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
78
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
89
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JsPathNotFound/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -17,6 +18,7 @@
1718
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=COM/@EntryIndexedValue">COM</s:String>
1819
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DOM/@EntryIndexedValue">DOM</s:String>
1920
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
21+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ICU/@EntryIndexedValue">ICU</s:String>
2022
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
2123
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
2224
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JS/@EntryIndexedValue">JS</s:String>
@@ -66,6 +68,7 @@
6668
<s:Boolean x:Key="/Default/UserDictionary/Words/=HOSTEXCEPTION/@EntryIndexedValue">True</s:Boolean>
6769
<s:Boolean x:Key="/Default/UserDictionary/Words/=HRESULT/@EntryIndexedValue">True</s:Boolean>
6870
<s:Boolean x:Key="/Default/UserDictionary/Words/=hwnd/@EntryIndexedValue">True</s:Boolean>
71+
<s:Boolean x:Key="/Default/UserDictionary/Words/=icudtl/@EntryIndexedValue">True</s:Boolean>
6972
<s:Boolean x:Key="/Default/UserDictionary/Words/=instanceof/@EntryIndexedValue">True</s:Boolean>
7073
<s:Boolean x:Key="/Default/UserDictionary/Words/=INVALIDARG/@EntryIndexedValue">True</s:Boolean>
7174
<s:Boolean x:Key="/Default/UserDictionary/Words/=Invocability/@EntryIndexedValue">True</s:Boolean>

ClearScript/DelegateFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static TDelegate CreateDelegate<TDelegate>(ScriptEngine engine, object ta
4040

4141
public static Delegate CreateDelegate(ScriptEngine engine, object target, Type delegateType)
4242
{
43-
MiscHelpers.VerifyNonNullArgument(target, "target");
43+
MiscHelpers.VerifyNonNullArgument(target, nameof(target));
4444
if (!typeof(Delegate).IsAssignableFrom(delegateType))
4545
{
4646
throw new ArgumentException("Invalid delegate type");

ClearScript/DocumentInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public DocumentInfo(string name)
3838
public DocumentInfo(Uri uri)
3939
: this()
4040
{
41-
MiscHelpers.VerifyNonNullArgument(uri, "uri");
41+
MiscHelpers.VerifyNonNullArgument(uri, nameof(uri));
4242
Uri = uri.IsAbsoluteUri ? uri : new Uri(Directory.GetCurrentDirectory() + Path.DirectorySeparatorChar + uri);
4343
name = Path.GetFileName(Uri.AbsolutePath);
4444
uniqueId = Interlocked.Increment(ref lastUniqueId).ToUnsigned();

ClearScript/DocumentLoader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public virtual uint MaxCacheSize
6666
/// </remarks>
6767
public virtual Document LoadDocument(DocumentSettings settings, DocumentInfo? sourceInfo, string specifier, DocumentCategory category, DocumentContextCallback contextCallback)
6868
{
69-
MiscHelpers.VerifyNonBlankArgument(specifier, "specifier", "Invalid document specifier");
69+
MiscHelpers.VerifyNonBlankArgument(specifier, nameof(specifier), "Invalid document specifier");
7070

7171
try
7272
{
@@ -395,8 +395,8 @@ private Document CacheDocument(Document document)
395395

396396
public override async Task<Document> LoadDocumentAsync(DocumentSettings settings, DocumentInfo? sourceInfo, string specifier, DocumentCategory category, DocumentContextCallback contextCallback)
397397
{
398-
MiscHelpers.VerifyNonNullArgument(settings, "settings");
399-
MiscHelpers.VerifyNonBlankArgument(specifier, "specifier", "Invalid document specifier");
398+
MiscHelpers.VerifyNonNullArgument(settings, nameof(settings));
399+
MiscHelpers.VerifyNonBlankArgument(specifier, nameof(specifier), "Invalid document specifier");
400400

401401
if ((settings.AccessFlags & DocumentAccessFlags.EnableAllLoading) == DocumentAccessFlags.None)
402402
{

ClearScript/DocumentSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void AddSystemDocument(string identifier, DocumentCategory category, stri
130130
/// </remarks>
131131
public void AddSystemDocument(string identifier, DocumentCategory category, string contents, DocumentContextCallback contextCallback)
132132
{
133-
MiscHelpers.VerifyNonBlankArgument(identifier, "specifier", "Invalid document specifier");
133+
MiscHelpers.VerifyNonBlankArgument(identifier, nameof(identifier), "Invalid document specifier");
134134
var info = new DocumentInfo(Path.GetFileName(identifier)) { Category = category, ContextCallback = contextCallback };
135135
AddSystemDocument(identifier, new StringDocument(info, contents));
136136
}
@@ -149,7 +149,7 @@ public void AddSystemDocument(string identifier, DocumentCategory category, stri
149149
/// </remarks>
150150
public void AddSystemDocument(string identifier, Document document)
151151
{
152-
MiscHelpers.VerifyNonNullArgument(document, "document");
152+
MiscHelpers.VerifyNonNullArgument(document, nameof(document));
153153
systemDocumentMap[Tuple.Create(identifier, document.Info.Category)] = document;
154154
}
155155

ClearScript/Exports/VersionSymbols.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#pragma once
77

8-
#define CLEARSCRIPT_VERSION_STRING "7.0.0"
9-
#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 7,0,0
10-
#define CLEARSCRIPT_VERSION_STRING_INFORMATIONAL "7.0.0"
8+
#define CLEARSCRIPT_VERSION_STRING "7.1.0"
9+
#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 7,1,0
10+
#define CLEARSCRIPT_VERSION_STRING_INFORMATIONAL "7.1.0"
1111
#define CLEARSCRIPT_FILE_FLAGS 0L

ClearScript/Extensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public static object ToHostType(this Type type)
3131
/// <returns>A host type for use with script code.</returns>
3232
public static object ToHostType(this Type type, ScriptEngine engine)
3333
{
34-
MiscHelpers.VerifyNonNullArgument(type, "type");
35-
MiscHelpers.VerifyNonNullArgument(engine, "engine");
34+
MiscHelpers.VerifyNonNullArgument(type, nameof(type));
35+
MiscHelpers.VerifyNonNullArgument(engine, nameof(engine));
3636
return HostItem.Wrap(engine, HostType.Wrap(type));
3737
}
3838

@@ -58,8 +58,8 @@ public static object ToRestrictedHostObject<T>(this T target)
5858
/// <returns>A host object with the specified type restriction.</returns>
5959
public static object ToRestrictedHostObject<T>(this T target, ScriptEngine engine)
6060
{
61-
MiscHelpers.VerifyNonNullArgument(target, "target");
62-
MiscHelpers.VerifyNonNullArgument(engine, "engine");
61+
MiscHelpers.VerifyNonNullArgument(target, nameof(target));
62+
MiscHelpers.VerifyNonNullArgument(engine, nameof(engine));
6363
return HostItem.Wrap(engine, target, typeof(T));
6464
}
6565
}

0 commit comments

Comments
 (0)