diff --git a/Directory.Build.props b/Directory.Build.props index 08ca89b..46d3768 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,7 @@ 1.227.1 v0.6.1 - 0.41.0 + 0.52.0 0.10.0 diff --git a/samples/calculator/Adder/OperationsImpl.cs b/samples/calculator/Adder/OperationsImpl.cs index 0f6bb96..64c13a4 100644 --- a/samples/calculator/Adder/OperationsImpl.cs +++ b/samples/calculator/Adder/OperationsImpl.cs @@ -1,6 +1,6 @@ -namespace ComputerWorld.wit.exports.example.calculator; +namespace ComputerWorld.wit.Exports.example.calculator; -public class OperationsImpl : IOperations +public class OperationsExportsImpl : IOperationsExports { public static int Add(int left, int right) { diff --git a/samples/calculator/CalculatorHost/Program.cs b/samples/calculator/CalculatorHost/Program.cs index 9c5a12f..8ab301e 100644 --- a/samples/calculator/CalculatorHost/Program.cs +++ b/samples/calculator/CalculatorHost/Program.cs @@ -1,8 +1,8 @@ -using HostappWorld.wit.imports.example.calculator; +using HostappWorld.wit.Imports.example.calculator; var left = 123; var right = 456; -var result = OperationsInterop.Add(left, right); +var result = IOperationsImports.Add(left, right); Console.WriteLine($"{left} + {right} = {result}"); -Console.WriteLine(OperationsInterop.ToUpper("Hello, World!")); +Console.WriteLine(IOperationsImports.ToUpper("Hello, World!")); diff --git a/test/E2ETest/testapps/E2EConsumer/Program.cs b/test/E2ETest/testapps/E2EConsumer/Program.cs index 6c1943c..6869490 100644 --- a/test/E2ETest/testapps/E2EConsumer/Program.cs +++ b/test/E2ETest/testapps/E2EConsumer/Program.cs @@ -1,12 +1,12 @@ using System.Runtime.InteropServices; -using ConsumerWorld.wit.imports.test.producerConsumer; +using ConsumerWorld.wit.Imports.test.producerConsumer; Console.WriteLine($"Hello, world on {RuntimeInformation.OSArchitecture}"); -var result = OperationsInterop.Add(123, 456); +var result = IOperationsImports.Add(123, 456); Console.WriteLine($"123 + 456 = {result}"); // this is just here to make sure we can enable features and pass flags via WitBindgenAddtionalArgs // the fact that it compiles is enough to test this worked. -var floatResult = OperationsInterop.AddFloat(1.1f, 1.2f); +var floatResult = IOperationsImports.AddFloat(1.1f, 1.2f); Console.WriteLine($"1.1 + 1.2 = {floatResult}"); diff --git a/test/E2ETest/testapps/E2EProducer/OperationsImpl.cs b/test/E2ETest/testapps/E2EProducer/OperationsImpl.cs index 7ce279a..531bbb4 100644 --- a/test/E2ETest/testapps/E2EProducer/OperationsImpl.cs +++ b/test/E2ETest/testapps/E2EProducer/OperationsImpl.cs @@ -1,6 +1,6 @@ -namespace ProducerWorld.wit.exports.test.producerConsumer; +namespace ProducerWorld.wit.Exports.test.producerConsumer; -public class OperationsImpl : IOperations +public class OperationsExportsImpl : IOperationsExports { public static int Add(int left, int right) { diff --git a/test/WasmComponentSdkTest/testapps/AppWithWitFolder/program.cs b/test/WasmComponentSdkTest/testapps/AppWithWitFolder/program.cs index d0b58d6..02960b5 100644 --- a/test/WasmComponentSdkTest/testapps/AppWithWitFolder/program.cs +++ b/test/WasmComponentSdkTest/testapps/AppWithWitFolder/program.cs @@ -1 +1 @@ -ImportstestWorld.wit.imports.test.pkg.v0_2_0.FolderInterop.Folder(); +ImportstestWorld.wit.Imports.test.pkg.v0_2_0.IFolderImports.Folder(); diff --git a/test/WasmComponentSdkTest/testapps/OciWit/Code.cs b/test/WasmComponentSdkTest/testapps/OciWit/Code.cs index 0521c76..5040021 100644 --- a/test/WasmComponentSdkTest/testapps/OciWit/Code.cs +++ b/test/WasmComponentSdkTest/testapps/OciWit/Code.cs @@ -1,33 +1,33 @@ -using CommandWorld.wit.exports.wasi.cli.v0_2_0; +using CommandWorld.wit.Exports.wasi.cli.v0_2_0; using MyFuncsWorld; using System.Text; -namespace ProxyWorld.wit.exports.wasi.http.v0_2_0 +namespace ProxyWorld.wit.Exports.wasi.http.v0_2_0 { - using ProxyWorld.wit.imports.wasi.http.v0_2_0; - public class IncomingHandlerImpl : IIncomingHandler + using ProxyWorld.wit.Imports.wasi.http.v0_2_0; + public class IncomingHandlerExportsImpl : IIncomingHandlerExports { - public static void Handle(ITypes.IncomingRequest request, ITypes.ResponseOutparam responseOut) + public static void Handle(ITypesImports.IncomingRequest request, ITypesImports.ResponseOutparam responseOut) { var content = Encoding.ASCII.GetBytes("Hello, from C#!"); var headers = new List<(string, byte[])> { ("content-type", Encoding.ASCII.GetBytes("text/plain")), ("content-length", Encoding.ASCII.GetBytes(content.Count().ToString())) }; - var response = new ITypes.OutgoingResponse(ITypes.Fields.FromList(headers)); + var response = new ITypesImports.OutgoingResponse(ITypesImports.Fields.FromList(headers)); var body = response.Body(); - ITypes.ResponseOutparam.Set(responseOut, Result.Ok(response)); + ITypesImports.ResponseOutparam.Set(responseOut, Result.Ok(response)); using (var stream = body.Write()) { stream.BlockingWriteAndFlush(content); } - ITypes.OutgoingBody.Finish(body, null); + ITypesImports.OutgoingBody.Finish(body, null); } } } -namespace CommandWorld.wit.exports.wasi.cli.v0_2_0 +namespace CommandWorld.wit.Exports.wasi.cli.v0_2_0 { - public class RunImpl : IRun + public class RunExportsImpl : IRunExports { public static void Run() { @@ -38,11 +38,11 @@ public static void Run() namespace MyFuncsWorld { - public class MyFuncsWorldImpl : IMyFuncsWorld + public class MyFuncsWorldExportsImpl : IMyFuncsWorldExports { public static int GetNumber() { return 123; } } -} \ No newline at end of file +} diff --git a/test/WasmComponentSdkTest/testapps/SimpleConsumer/Program.cs b/test/WasmComponentSdkTest/testapps/SimpleConsumer/Program.cs index db95c0d..359aa92 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleConsumer/Program.cs +++ b/test/WasmComponentSdkTest/testapps/SimpleConsumer/Program.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; -using ConsumerWorld.wit.imports.test.producerConsumer; +using ConsumerWorld.wit.Imports.test.producerConsumer; Console.WriteLine($"Hello, world on {RuntimeInformation.OSArchitecture}"); -var result = OperationsInterop.Add(123, 456); +var result = IOperationsImports.Add(123, 456); Console.WriteLine($"123 + 456 = {result}"); diff --git a/test/WasmComponentSdkTest/testapps/SimpleProducer/OperationsImpl.cs b/test/WasmComponentSdkTest/testapps/SimpleProducer/OperationsImpl.cs index 2b65805..292d936 100644 --- a/test/WasmComponentSdkTest/testapps/SimpleProducer/OperationsImpl.cs +++ b/test/WasmComponentSdkTest/testapps/SimpleProducer/OperationsImpl.cs @@ -1,6 +1,6 @@ -namespace ProducerWorld.wit.exports.test.producerConsumer; +namespace ProducerWorld.wit.Exports.test.producerConsumer; -public class OperationsImpl : IOperations +public class OperationsExportsImpl : IOperationsExports { public static int Add(int left, int right) { diff --git a/test/WitBindgenTest/WitBindgenTest/CodeGenerationTest.cs b/test/WitBindgenTest/WitBindgenTest/CodeGenerationTest.cs index df5d059..f6cfc1d 100644 --- a/test/WitBindgenTest/WitBindgenTest/CodeGenerationTest.cs +++ b/test/WitBindgenTest/WitBindgenTest/CodeGenerationTest.cs @@ -22,30 +22,30 @@ public void GeneratesSimpleExport() // The fact that this compiles is what matters. There would be no point calling // the function to validate its behavior, as that has nothing to do with WIT codegen // and wouldn't even be running as WebAssembly. - Assert.NotNull((Func)MyFuncsWorldImpl.GetNumber); + Assert.NotNull((Func)MyFuncsWorldExportsImpl.GetNumber); } [Fact] public void CanSpecifyWorld() { - Assert.NotNull((Func)SomeStuffImpl.GetNumber); + Assert.NotNull((Func)SomeStuffExportsImpl.GetNumber); } [Fact] public void ShouldBeNormalResult() { - Assert.NotNull((Func)MyResultsWorldImpl.StringError); + Assert.NotNull((Func)MyResultsWorldExportsImpl.StringError); } [Fact] public void ShouldBeNormalWitResult() { - Assert.NotNull((Func>)MyWitResultsWorldImpl.StringError); + Assert.NotNull((Func>)MyWitResultsWorldExportsImpl.StringError); } [Fact] public void CanChangeWitouputLocation() { - Assert.NotNull((Func)MySimpleWorldImpl.GetNumber); + Assert.NotNull((Func)MySimpleWorldExportsImpl.GetNumber); } } diff --git a/test/WitBindgenTest/testapps/LibraryUsingWit/Code.cs b/test/WitBindgenTest/testapps/LibraryUsingWit/Code.cs index add2c31..523ab69 100644 --- a/test/WitBindgenTest/testapps/LibraryUsingWit/Code.cs +++ b/test/WitBindgenTest/testapps/LibraryUsingWit/Code.cs @@ -4,7 +4,7 @@ public class Code { public static void CallSimpleDoSomething() { - MyFuncsWorld.exports.MyFuncsWorld.DoSomething(); + MyFuncsWorld.IMyFuncsWorldImports.DoSomething(); } } diff --git a/test/WitBindgenTest/testapps/LibraryUsingWit/MyFuncsWorldImpl.cs b/test/WitBindgenTest/testapps/LibraryUsingWit/MyFuncsWorldImpl.cs index 6937880..ceea114 100644 --- a/test/WitBindgenTest/testapps/LibraryUsingWit/MyFuncsWorldImpl.cs +++ b/test/WitBindgenTest/testapps/LibraryUsingWit/MyFuncsWorldImpl.cs @@ -1,6 +1,6 @@ using MyFuncsWorld; -public class MyFuncsWorldImpl : IMyFuncsWorld +public class MyFuncsWorldExportsImpl : IMyFuncsWorldExports { public static int GetNumber() { diff --git a/test/WitBindgenTest/testapps/LibraryUsingWit/SomeStuffImpl.cs b/test/WitBindgenTest/testapps/LibraryUsingWit/SomeStuffImpl.cs index bfa1d96..5df42c7 100644 --- a/test/WitBindgenTest/testapps/LibraryUsingWit/SomeStuffImpl.cs +++ b/test/WitBindgenTest/testapps/LibraryUsingWit/SomeStuffImpl.cs @@ -1,8 +1,8 @@ // I don't think this namespace should be so different to the one in MyFuncsWorldImpl, // but currently that's what the codegen requires -using ProducerWorld.wit.exports.test.multipleWorlds; +using ProducerWorld.wit.Exports.test.multipleWorlds; -public class SomeStuffImpl : ISomeStuff +public class SomeStuffExportsImpl : ISomeStuffExports { public static int GetNumber() { diff --git a/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/Code.cs b/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/Code.cs index bda8617..e0eadab 100644 --- a/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/Code.cs +++ b/test/WitBindgenTest/testapps/LibraryWithCustomGeneratedFilesLocation/Code.cs @@ -1,6 +1,6 @@ using MySimpleWorld; -public class MySimpleWorldImpl : IMySimpleWorld +public class MySimpleWorldExportsImpl : IMySimpleWorldExports { public static int GetNumber() { diff --git a/test/WitBindgenTest/testapps/LibraryWithExceptions/Result.cs b/test/WitBindgenTest/testapps/LibraryWithExceptions/Result.cs index d473cb8..3617526 100644 --- a/test/WitBindgenTest/testapps/LibraryWithExceptions/Result.cs +++ b/test/WitBindgenTest/testapps/LibraryWithExceptions/Result.cs @@ -1,6 +1,6 @@ using MyResultsWorld; -public class MyResultsWorldImpl : IMyResultsWorld +public class MyResultsWorldExportsImpl : IMyResultsWorldExports { public static float StringError(float a) { diff --git a/test/WitBindgenTest/testapps/LibraryWithWitResultType/Result.cs b/test/WitBindgenTest/testapps/LibraryWithWitResultType/Result.cs index cb01ccf..e80fac2 100644 --- a/test/WitBindgenTest/testapps/LibraryWithWitResultType/Result.cs +++ b/test/WitBindgenTest/testapps/LibraryWithWitResultType/Result.cs @@ -4,7 +4,7 @@ -public class MyWitResultsWorldImpl : IMyWitResultsWorld +public class MyWitResultsWorldExportsImpl : IMyWitResultsWorldExports { public static Result StringError(float a) {