Skip to content

Commit 0e6399e

Browse files
committed
C#: Make manual adjustments to the generated stubs.
1 parent 8967a09 commit 0e6399e

File tree

14 files changed

+52
-69
lines changed

14 files changed

+52
-69
lines changed

csharp/ql/test/resources/stubs/Antlr3.Runtime/3.5.1/Antlr3.Runtime.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="../../NETStandard.Library/1.6.0/NETStandard.Library.csproj" />
10+
<ProjectReference Include="../../NETStandard.Library/1.6.1/NETStandard.Library.csproj" />
1111
<ProjectReference Include="../../_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj" />
1212
</ItemGroup>
1313
</Project>

csharp/ql/test/resources/stubs/EntityFramework/6.4.4/EntityFramework.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<ItemGroup>
1010
<ProjectReference Include="../../Microsoft.CSharp/4.7.0/Microsoft.CSharp.csproj" />
1111
<ProjectReference Include="../../System.CodeDom/4.7.0/System.CodeDom.csproj" />
12-
<ProjectReference Include="../../System.ComponentModel.Annotations/4.7.0/System.ComponentModel.Annotations.csproj" />
13-
<ProjectReference Include="../../System.Configuration.ConfigurationManager/4.7.0/System.Configuration.ConfigurationManager.csproj" />
14-
<ProjectReference Include="../../System.Data.SqlClient/4.8.1/System.Data.SqlClient.csproj" />
12+
<ProjectReference Include="../../System.ComponentModel.Annotations/5.0.0/System.ComponentModel.Annotations.csproj" />
13+
<ProjectReference Include="../../System.Configuration.ConfigurationManager/6.0.0/System.Configuration.ConfigurationManager.csproj" />
14+
<ProjectReference Include="../../System.Data.SqlClient/4.8.5/System.Data.SqlClient.csproj" />
1515
<ProjectReference Include="../../_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj" />
1616
</ItemGroup>
1717
</Project>

csharp/ql/test/resources/stubs/Microsoft.Win32.Registry/4.7.0/Microsoft.Win32.Registry.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="../../System.Security.AccessControl/4.7.0/System.Security.AccessControl.csproj" />
10+
<ProjectReference Include="../../System.Security.AccessControl/6.0.0/System.Security.AccessControl.csproj" />
1111
<ProjectReference Include="../../System.Security.Principal.Windows/4.7.0/System.Security.Principal.Windows.csproj" />
1212
<ProjectReference Include="../../_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj" />
1313
</ItemGroup>

csharp/ql/test/resources/stubs/NHibernate/5.4.7/NHibernate.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="../../Antlr3.Runtime/[3.5.1, 4.0.0)/Antlr3.Runtime.csproj" />
11-
<ProjectReference Include="../../Iesi.Collections/[4.0.4, 5.0.0)/Iesi.Collections.csproj" />
12-
<ProjectReference Include="../../Remotion.Linq/[2.2.0, 3.0.0)/Remotion.Linq.csproj" />
13-
<ProjectReference Include="../../Remotion.Linq.EagerFetching/[2.2.0, 3.0.0)/Remotion.Linq.EagerFetching.csproj" />
10+
<ProjectReference Include="../../Antlr3.Runtime/3.5.1/Antlr3.Runtime.csproj" />
11+
<ProjectReference Include="../../Iesi.Collections/4.0.4/Iesi.Collections.csproj" />
12+
<ProjectReference Include="../../Remotion.Linq/2.2.0/Remotion.Linq.csproj" />
13+
<ProjectReference Include="../../Remotion.Linq.EagerFetching/2.2.0/Remotion.Linq.EagerFetching.csproj" />
1414
<ProjectReference Include="../../System.Configuration.ConfigurationManager/6.0.0/System.Configuration.ConfigurationManager.csproj" />
1515
<ProjectReference Include="../../_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj" />
1616
</ItemGroup>

csharp/ql/test/resources/stubs/Remotion.Linq.EagerFetching/2.2.0/Remotion.Linq.EagerFetching.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
<ItemGroup>
1010
<ProjectReference Include="../../Remotion.Linq/2.2.0/Remotion.Linq.csproj" />
11-
<ProjectReference Include="../../System.Collections/4.0.11/System.Collections.csproj" />
12-
<ProjectReference Include="../../System.Linq/4.1.0/System.Linq.csproj" />
13-
<ProjectReference Include="../../System.Linq.Expressions/4.1.0/System.Linq.Expressions.csproj" />
14-
<ProjectReference Include="../../System.ObjectModel/4.0.12/System.ObjectModel.csproj" />
15-
<ProjectReference Include="../../System.Reflection/4.1.0/System.Reflection.csproj" />
16-
<ProjectReference Include="../../System.Runtime/4.1.0/System.Runtime.csproj" />
11+
<ProjectReference Include="../../System.Collections/4.3.0/System.Collections.csproj" />
12+
<ProjectReference Include="../../System.Linq/4.3.0/System.Linq.csproj" />
13+
<ProjectReference Include="../../System.Linq.Expressions/4.3.0/System.Linq.Expressions.csproj" />
14+
<ProjectReference Include="../../System.ObjectModel/4.3.0/System.ObjectModel.csproj" />
15+
<ProjectReference Include="../../System.Reflection/4.3.0/System.Reflection.csproj" />
16+
<ProjectReference Include="../../System.Runtime/4.3.0/System.Runtime.csproj" />
1717
<ProjectReference Include="../../_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj" />
1818
</ItemGroup>
1919
</Project>

csharp/ql/test/resources/stubs/Remotion.Linq/2.2.0/Remotion.Linq.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="../../System.Collections/4.0.11/System.Collections.csproj" />
11-
<ProjectReference Include="../../System.Diagnostics.Debug/4.0.11/System.Diagnostics.Debug.csproj" />
12-
<ProjectReference Include="../../System.Linq/4.1.0/System.Linq.csproj" />
13-
<ProjectReference Include="../../System.Linq.Expressions/4.1.0/System.Linq.Expressions.csproj" />
10+
<ProjectReference Include="../../System.Collections/4.3.0/System.Collections.csproj" />
11+
<ProjectReference Include="../../System.Diagnostics.Debug/4.3.0/System.Diagnostics.Debug.csproj" />
12+
<ProjectReference Include="../../System.Linq/4.3.0/System.Linq.csproj" />
13+
<ProjectReference Include="../../System.Linq.Expressions/4.3.0/System.Linq.Expressions.csproj" />
1414
<ProjectReference Include="../../System.Linq.Queryable/4.0.1/System.Linq.Queryable.csproj" />
15-
<ProjectReference Include="../../System.ObjectModel/4.0.12/System.ObjectModel.csproj" />
16-
<ProjectReference Include="../../System.Reflection/4.1.0/System.Reflection.csproj" />
17-
<ProjectReference Include="../../System.Reflection.Extensions/4.0.1/System.Reflection.Extensions.csproj" />
18-
<ProjectReference Include="../../System.Runtime/4.1.0/System.Runtime.csproj" />
19-
<ProjectReference Include="../../System.Runtime.Extensions/4.1.0/System.Runtime.Extensions.csproj" />
20-
<ProjectReference Include="../../System.Threading/4.0.11/System.Threading.csproj" />
15+
<ProjectReference Include="../../System.ObjectModel/4.3.0/System.ObjectModel.csproj" />
16+
<ProjectReference Include="../../System.Reflection/4.3.0/System.Reflection.csproj" />
17+
<ProjectReference Include="../../System.Reflection.Extensions/4.3.0/System.Reflection.Extensions.csproj" />
18+
<ProjectReference Include="../../System.Runtime/4.3.0/System.Runtime.csproj" />
19+
<ProjectReference Include="../../System.Runtime.Extensions/4.3.0/System.Runtime.Extensions.csproj" />
20+
<ProjectReference Include="../../System.Threading/4.3.0/System.Threading.csproj" />
2121
<ProjectReference Include="../../_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj" />
2222
</ItemGroup>
2323
</Project>

csharp/ql/test/resources/stubs/ServiceStack.Common/8.0.0/ServiceStack.Common.cs

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,15 +1436,11 @@ public class DefaultScripts : ServiceStack.Script.ScriptMethods, ServiceStack.Sc
14361436
public long decrBy(long value, long by) => throw null;
14371437
public long decrement(long value) => throw null;
14381438
public long decrementBy(long value, long by) => throw null;
1439-
public object default(object returnTarget, object elseReturn) => throw null;
1440-
public string dirPath(string filePath) => throw null;
1439+
public string dirPath(string filePath) => throw null;
14411440
public System.Collections.Generic.IEnumerable<object> distinct(System.Collections.Generic.IEnumerable<object> items) => throw null;
14421441
public double div(double lhs, double rhs) => throw null;
14431442
public double divide(double lhs, double rhs) => throw null;
1444-
public object do(ServiceStack.Script.ScriptScopeContext scope, object expression) => throw null;
1445-
public System.Threading.Tasks.Task do(ServiceStack.Script.ScriptScopeContext scope, object target, object expression) => throw null;
1446-
public System.Threading.Tasks.Task do(ServiceStack.Script.ScriptScopeContext scope, object target, object expression, object scopeOptions) => throw null;
1447-
public object doIf(object test) => throw null;
1443+
public object doIf(object test) => throw null;
14481444
public object doIf(object ignoreTarget, object test) => throw null;
14491445
public double doubleAdd(double lhs, double rhs) => throw null;
14501446
public double doubleDiv(double lhs, double rhs) => throw null;
@@ -1562,9 +1558,7 @@ public class DefaultScripts : ServiceStack.Script.ScriptMethods, ServiceStack.Sc
15621558
public string httpPathInfo(ServiceStack.Script.ScriptScopeContext scope) => throw null;
15631559
public string httpRequestUrl(ServiceStack.Script.ScriptScopeContext scope) => throw null;
15641560
public string humanize(string text) => throw null;
1565-
public object if(object test) => throw null;
1566-
public object if(object returnTarget, object test) => throw null;
1567-
public object ifDebug(ServiceStack.Script.ScriptScopeContext scope, object ignoreTarget) => throw null;
1561+
public object ifDebug(ServiceStack.Script.ScriptScopeContext scope, object ignoreTarget) => throw null;
15681562
public object ifDebug(ServiceStack.Script.ScriptScopeContext scope) => throw null;
15691563
public object ifDo(object test) => throw null;
15701564
public object ifDo(object ignoreTarget, object test) => throw null;
@@ -1846,10 +1840,7 @@ public class DefaultScripts : ServiceStack.Script.ScriptMethods, ServiceStack.Sc
18461840
public object resolveContextArg(ServiceStack.Script.ScriptScopeContext scope, string name) => throw null;
18471841
public object resolveGlobal(ServiceStack.Script.ScriptScopeContext scope, string name) => throw null;
18481842
public object resolvePageArg(ServiceStack.Script.ScriptScopeContext scope, string name) => throw null;
1849-
public ServiceStack.Script.StopExecution return(ServiceStack.Script.ScriptScopeContext scope) => throw null;
1850-
public ServiceStack.Script.StopExecution return(ServiceStack.Script.ScriptScopeContext scope, object returnValue) => throw null;
1851-
public ServiceStack.Script.StopExecution return(ServiceStack.Script.ScriptScopeContext scope, object returnValue, System.Collections.Generic.Dictionary<string, object> returnArgs) => throw null;
1852-
public System.Collections.Generic.IEnumerable<object> reverse(ServiceStack.Script.ScriptScopeContext scope, System.Collections.Generic.IEnumerable<object> original) => throw null;
1843+
public System.Collections.Generic.IEnumerable<object> reverse(ServiceStack.Script.ScriptScopeContext scope, System.Collections.Generic.IEnumerable<object> original) => throw null;
18531844
public string rightPart(string text, string needle) => throw null;
18541845
public double round(double value) => throw null;
18551846
public double round(double value, int decimals) => throw null;
@@ -1939,9 +1930,7 @@ public class DefaultScripts : ServiceStack.Script.ScriptMethods, ServiceStack.Sc
19391930
public System.Collections.Generic.IEnumerable<object> thenByDescending(ServiceStack.Script.ScriptScopeContext scope, object target, object expression) => throw null;
19401931
public System.Collections.Generic.IEnumerable<object> thenByDescending(ServiceStack.Script.ScriptScopeContext scope, object target, object expression, object scopeOptions) => throw null;
19411932
public static System.Collections.Generic.IEnumerable<object> thenByInternal(string filterName, ServiceStack.Script.ScriptScopeContext scope, object target, object expression, object scopeOptions) => throw null;
1942-
public object throw(ServiceStack.Script.ScriptScopeContext scope, string message) => throw null;
1943-
public object throw(ServiceStack.Script.ScriptScopeContext scope, string message, object options) => throw null;
1944-
public object throwArgumentException(ServiceStack.Script.ScriptScopeContext scope, string message) => throw null;
1933+
public object throwArgumentException(ServiceStack.Script.ScriptScopeContext scope, string message) => throw null;
19451934
public object throwArgumentException(ServiceStack.Script.ScriptScopeContext scope, string message, string options) => throw null;
19461935
public object throwArgumentNullException(ServiceStack.Script.ScriptScopeContext scope, string paramName) => throw null;
19471936
public object throwArgumentNullException(ServiceStack.Script.ScriptScopeContext scope, string paramName, object options) => throw null;
@@ -3174,8 +3163,7 @@ public class ProtectedScripts : ServiceStack.Script.ScriptMethods
31743163
public ProtectedScripts() => throw null;
31753164
public ServiceStack.Script.IgnoreResult Decrypt(string path) => throw null;
31763165
public ServiceStack.Script.IgnoreResult Decrypt(ServiceStack.Script.FileScripts fs, string path) => throw null;
3177-
public object default(string typeName) => throw null;
3178-
public ServiceStack.Script.IgnoreResult Delete(string path) => throw null;
3166+
public ServiceStack.Script.IgnoreResult Delete(string path) => throw null;
31793167
public ServiceStack.Script.IgnoreResult Delete(ServiceStack.Script.IOScript os, string path) => throw null;
31803168
public string deleteDirectory(string virtualPath) => throw null;
31813169
public string deleteDirectory(ServiceStack.IO.IVirtualPathProvider vfs, string virtualPath) => throw null;
@@ -3265,9 +3253,7 @@ public class ProtectedScripts : ServiceStack.Script.ScriptMethods
32653253
public ServiceStack.Script.IgnoreResult Move(string from, string to) => throw null;
32663254
public ServiceStack.Script.IgnoreResult Move(ServiceStack.Script.IOScript os, string from, string to) => throw null;
32673255
public string mv(ServiceStack.Script.ScriptScopeContext scope, string from, string to) => throw null;
3268-
public object new (string typeName) => throw null;
3269-
public object new (string typeName, System.Collections.Generic.List<object> constructorArgs) => throw null;
3270-
public string osPaths(string path) => throw null;
3256+
public string osPaths(string path) => throw null;
32713257
public string proc(ServiceStack.Script.ScriptScopeContext scope, string fileName) => throw null;
32723258
public string proc(ServiceStack.Script.ScriptScopeContext scope, string fileName, System.Collections.Generic.Dictionary<string, object> options) => throw null;
32733259
public byte[] ReadAllBytes(string path) => throw null;
@@ -3298,8 +3284,7 @@ public class ProtectedScripts : ServiceStack.Script.ScriptMethods
32983284
public string textContents(ServiceStack.IO.IVirtualFile file) => throw null;
32993285
public string touch(ServiceStack.Script.ScriptScopeContext scope, string target) => throw null;
33003286
public static string TypeNotFoundErrorMessage(string typeName) => throw null;
3301-
public System.Type typeof(string typeName) => throw null;
3302-
public System.Type typeofProgId(string name) => throw null;
3287+
public System.Type typeofProgId(string name) => throw null;
33033288
public string typeQualifiedName(System.Type type) => throw null;
33043289
public System.ReadOnlyMemory<byte> urlBytesContents(ServiceStack.Script.ScriptScopeContext scope, string url, object options) => throw null;
33053290
public System.Threading.Tasks.Task urlContents(ServiceStack.Script.ScriptScopeContext scope, string url) => throw null;

csharp/ql/test/resources/stubs/ServiceStack.Text/8.0.0/ServiceStack.Text.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,8 +1042,7 @@ public static partial class ListExtensions
10421042
}
10431043
public class LongRange : System.IEquatable<ServiceStack.LongRange>
10441044
{
1045-
public virtual ServiceStack.LongRange<Clone>$() => throw null;
1046-
public LongRange(long from, long? to = default(long?)) => throw null;
1045+
public LongRange(long from, long? to = default(long?)) => throw null;
10471046
protected LongRange(ServiceStack.LongRange original) => throw null;
10481047
public void Deconstruct(out long from, out long? to) => throw null;
10491048
protected virtual System.Type EqualityContract { get => throw null; }
@@ -1118,8 +1117,7 @@ public static class MimeTypes
11181117
}
11191118
public class NameValue : System.IEquatable<ServiceStack.NameValue>
11201119
{
1121-
public virtual ServiceStack.NameValue<Clone>$() => throw null;
1122-
public NameValue(string name, string value) => throw null;
1120+
public NameValue(string name, string value) => throw null;
11231121
protected NameValue(ServiceStack.NameValue original) => throw null;
11241122
public void Deconstruct(out string name, out string value) => throw null;
11251123
protected virtual System.Type EqualityContract { get => throw null; }

csharp/ql/test/resources/stubs/System.Data.SQLite.Core/1.0.118/System.Data.SQLite.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="../../Stub.System.Data.SQLite.Core.NetStandard/[1.0.118]/Stub.System.Data.SQLite.Core.NetStandard.csproj" />
10+
<ProjectReference Include="../../Stub.System.Data.SQLite.Core.NetStandard/1.0.118/Stub.System.Data.SQLite.Core.NetStandard.csproj" />
1111
<ProjectReference Include="../../_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj" />
1212
</ItemGroup>
1313
</Project>

csharp/ql/test/resources/stubs/System.Data.SQLite/1.0.118/System.Data.SQLite.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="../../System.Data.SQLite.Core/[1.0.118]/System.Data.SQLite.Core.csproj" />
11-
<ProjectReference Include="../../System.Data.SQLite.EF6/[1.0.118]/System.Data.SQLite.EF6.csproj" />
10+
<ProjectReference Include="../../System.Data.SQLite.Core/1.0.118/System.Data.SQLite.Core.csproj" />
11+
<ProjectReference Include="../../System.Data.SQLite.EF6/1.0.118/System.Data.SQLite.EF6.csproj" />
1212
<ProjectReference Include="../../_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj" />
1313
</ItemGroup>
1414
</Project>

0 commit comments

Comments
 (0)