diff --git a/src/Boo.Core.sln b/src/Boo.Core.sln index ffd80f031..aceeceb4a 100644 --- a/src/Boo.Core.sln +++ b/src/Boo.Core.sln @@ -17,11 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Boo.Lang.Parser.Tests.Core" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3FD31683-A5EF-45B5-BD74-CEDFCF9A9EEA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lokad.ILPack", "..\..\ILPack\src\Lokad.ILPack.csproj", "{CFB4AE33-F886-4DD9-8855-F2B1AD6C5966}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Booc.Core", "booc\Booc.Core.csproj", "{2AAAA5D1-9D3C-414D-BAC7-7DC6FAFB790F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testcase", "Testcase\Testcase.csproj", "{C96E8F50-859F-4964-B7DD-727D052D8802}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Testcase\Test.csproj", "{C96E8F50-859F-4964-B7DD-727D052D8802}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -53,10 +51,6 @@ Global {939974F4-9F00-4833-B897-962D2C28865F}.Debug|Any CPU.Build.0 = Debug|Any CPU {939974F4-9F00-4833-B897-962D2C28865F}.Release|Any CPU.ActiveCfg = Release|Any CPU {939974F4-9F00-4833-B897-962D2C28865F}.Release|Any CPU.Build.0 = Release|Any CPU - {CFB4AE33-F886-4DD9-8855-F2B1AD6C5966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CFB4AE33-F886-4DD9-8855-F2B1AD6C5966}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CFB4AE33-F886-4DD9-8855-F2B1AD6C5966}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CFB4AE33-F886-4DD9-8855-F2B1AD6C5966}.Release|Any CPU.Build.0 = Release|Any CPU {2AAAA5D1-9D3C-414D-BAC7-7DC6FAFB790F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2AAAA5D1-9D3C-414D-BAC7-7DC6FAFB790F}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AAAA5D1-9D3C-414D-BAC7-7DC6FAFB790F}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/Boo.Lang.Compiler/Boo.Lang.Compiler Core.csproj b/src/Boo.Lang.Compiler/Boo.Lang.Compiler Core.csproj index aca19ae9a..4f232c3e8 100644 --- a/src/Boo.Lang.Compiler/Boo.Lang.Compiler Core.csproj +++ b/src/Boo.Lang.Compiler/Boo.Lang.Compiler Core.csproj @@ -14,12 +14,10 @@ - - diff --git a/src/Boo.Lang.Compiler/Steps/Ecma335/TypeSystemBridge.cs b/src/Boo.Lang.Compiler/Steps/Ecma335/TypeSystemBridge.cs index 3fad8eeef..1769fb2a3 100644 --- a/src/Boo.Lang.Compiler/Steps/Ecma335/TypeSystemBridge.cs +++ b/src/Boo.Lang.Compiler/Steps/Ecma335/TypeSystemBridge.cs @@ -45,13 +45,11 @@ public TypeSystemBridge(MetadataBuilder builder, TypeSystemServices tss, Func a.GetName().Name == "System.Runtime").GetName(); var privateAsm = loadedAssemblies.Single(a => a.GetName().Name == "System.Private.CoreLib"); var handle = HandleForAssemblyName(runtimeName); _assemblyLookup[privateAsm] = handle; - */ ObjectType = (TypeReferenceHandle)LookupType(tss.ObjectType); _getValue = getValue; diff --git a/src/Testcase/Program.cs b/src/Testcase/Program.cs index 27212bd1d..d68c3c8af 100644 --- a/src/Testcase/Program.cs +++ b/src/Testcase/Program.cs @@ -1,24 +1,18 @@ -using System; +using System.Threading; +using System.Threading.Tasks; +using System; +using System.Linq; -namespace Testcase +class Program { - public class Foo { } - - public class Bar : Foo - { - virtual public void Run() - { - Console.WriteLine("Bar.Run"); - } - } - - internal class Program + static void Main() { - static void Main(string[] args) - { - var foos = new Foo[] { new Bar(), new Bar() }; - foreach (Bar foo in foos) - foo.Run(); - } - } -} + var asm = typeof(C0).Assembly; + foreach (var type in asm.GetTypes()) + { + Console.WriteLine(type.Name); + foreach (var arg in (Attribute.GetCustomAttribute(asm.GetType(type.Name), typeof(VarArgsAttribute)) as VarArgsAttribute).Args) + Console.WriteLine($"\t{arg}"); + } + } +} \ No newline at end of file diff --git a/src/Testcase/Test.csproj b/src/Testcase/Test.csproj new file mode 100644 index 000000000..bacdb9a0d --- /dev/null +++ b/src/Testcase/Test.csproj @@ -0,0 +1,21 @@ + + + + Exe + net5.0 + + + + + + + + + C:\Users\mason\AppData\Local\Temp\testcase.dll + + + C:\Users\mason\AppData\Local\Temp\varargs-attribute-external$17.dll + + + + diff --git a/src/Testcase/Testcase.csproj b/src/Testcase/Testcase.csproj deleted file mode 100644 index 208270428..000000000 --- a/src/Testcase/Testcase.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - Exe - net5.0 - - - diff --git a/tests/testcases/integration/attributes/varargs-attribute-external.boo b/tests/testcases/integration/attributes/varargs-attribute-external.boo index 8db530fa3..127a7ff9f 100644 --- a/tests/testcases/integration/attributes/varargs-attribute-external.boo +++ b/tests/testcases/integration/attributes/varargs-attribute-external.boo @@ -18,7 +18,7 @@ code = [| import System [VarArgs] - class C0: + public class C0: pass [VarArgs("foo")]