Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: Cleanup build tasks and added new demo project #277

Merged
merged 1 commit into from
Sep 20, 2024
Merged

build: Cleanup build tasks and added new demo project #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/dscom.client/bin/Debug/net6.0/dscom.dll",
"args": ["tlbexport", "/verbose", "${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net6.0/dSPACE.Runtime.InteropServices.DemoAssembly1.dll", "/out:${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net6.0/dSPACE.Runtime.InteropServices.DemoAssembly1.tlb"],
"program": "${workspaceFolder}/src/dscom.client/bin/Debug/net8.0/dscom.dll",
"args": [
"tlbexport",
"/verbose",
"${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net8.0/dSPACE.Runtime.InteropServices.DemoAssembly1.dll",
"/out:${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net8.0/dSPACE.Runtime.InteropServices.DemoAssembly1.tlb"
],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
"console": "internalConsole"
Expand All @@ -17,8 +22,14 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/dscom.client/bin/Debug/net6.0/dscom.dll",
"args": ["tlbdump", "${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net6.0/dSPACE.Runtime.InteropServices.DemoAssembly1.tlb", "/out:${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net6.0/dSPACE.Runtime.InteropServices.DemoAssembly1.yaml", "/tlbrefpath:${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net6.0/", "/filterregex=\\.file\\="],
"program": "${workspaceFolder}/src/dscom.client/bin/Debug/net8.0/dscom.dll",
"args": [
"tlbdump",
"${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net8.0/dSPACE.Runtime.InteropServices.DemoAssembly1.tlb",
"/out:${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net8.0/dSPACE.Runtime.InteropServices.DemoAssembly1.yaml",
"/tlbrefpath:${workspaceFolder}/src/dscom.demo/assembly1/bin/Debug/net8.0/",
"/filterregex=\\.file\\="
],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
"console": "internalConsole"
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/dscom.client/dscom.client.csproj",
"${workspaceFolder}/dscom.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
Expand Down
11 changes: 11 additions & 0 deletions dscom.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "assembly4", "src\dscom.demo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "assembly5", "src\dscom.demo\assembly5\assembly5.csproj", "{ACECABE4-AD32-4618-889F-E210D9564C8F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "assembly6", "src\dscom.demo\assembly6\assembly6.csproj", "{243EC7AA-E56D-48B1-9DD6-C93661A746A5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -105,6 +107,14 @@ Global
{ACECABE4-AD32-4618-889F-E210D9564C8F}.Release|Any CPU.Build.0 = Release|Any CPU
{ACECABE4-AD32-4618-889F-E210D9564C8F}.Release|x86.ActiveCfg = Release|x86
{ACECABE4-AD32-4618-889F-E210D9564C8F}.Release|x86.Build.0 = Release|x86
{243EC7AA-E56D-48B1-9DD6-C93661A746A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{243EC7AA-E56D-48B1-9DD6-C93661A746A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{243EC7AA-E56D-48B1-9DD6-C93661A746A5}.Debug|x86.ActiveCfg = Debug|x86
{243EC7AA-E56D-48B1-9DD6-C93661A746A5}.Debug|x86.Build.0 = Debug|x86
{243EC7AA-E56D-48B1-9DD6-C93661A746A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{243EC7AA-E56D-48B1-9DD6-C93661A746A5}.Release|Any CPU.Build.0 = Release|Any CPU
{243EC7AA-E56D-48B1-9DD6-C93661A746A5}.Release|x86.ActiveCfg = Release|x86
{243EC7AA-E56D-48B1-9DD6-C93661A746A5}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -120,6 +130,7 @@ Global
{F8F68E57-CFFE-4EA5-9C1A-2CD9223B5D85} = {0A2E33B4-9DF7-4199-BC39-B0FC9C99FA97}
{375866D7-1313-408D-AE5A-A77E48711EDB} = {CAAB6257-7EC0-484E-9593-B60CEE8F47D1}
{ACECABE4-AD32-4618-889F-E210D9564C8F} = {CAAB6257-7EC0-484E-9593-B60CEE8F47D1}
{243EC7AA-E56D-48B1-9DD6-C93661A746A5} = {CAAB6257-7EC0-484E-9593-B60CEE8F47D1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3F23D9EA-A9D9-4CE5-94B5-050A9B68CA1C}
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"rollForward": "latestPatch"
"rollForward": "latestFeature"
}
}
12 changes: 12 additions & 0 deletions src/dscom.demo/assembly6/OptionalParameter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System.Runtime.InteropServices;

namespace dSPACE.Runtime.InteropServices.DemoAssembly6;

[ComVisible(true)]
public interface IOptionalParameter
{
public void Method1([Optional] int param1);
public void Method2(int param1 = default);
public void Method3(int param1 = 123);
public void Method4(int param1);
}
23 changes: 23 additions & 0 deletions src/dscom.demo/assembly6/assembly6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>10.0</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>dSPACE.Runtime.InteropServices.DemoAssembly6</RootNamespace>
<AssemblyName>dSPACE.Runtime.InteropServices.DemoAssembly6</AssemblyName>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<AnalysisMode>Recommended</AnalysisMode>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<Platforms>AnyCPU;x86</Platforms>
<EnableComHosting>true</EnableComHosting>
<NoWarn>NU5104,CS1591</NoWarn>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\dscom\dscom.csproj" />
</ItemGroup>

</Project>
Loading