Skip to content

Commit 292208c

Browse files
govertgovert
committed
Merge branch 'master' of https://github.com/Excel-DNA/ExcelDna 
2 parents f68cce7 + 9df9d28 commit 292208c

File tree

6 files changed

+41
-90
lines changed

6 files changed

+41
-90
lines changed

‎Source/ExcelDna.Integration/DnaLibrary.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,8 @@ internal void AutoOpen()
329329
AssemblyLoader.GetExcelMethods(NativeAOT.MethodsForRegistration, true, _methods, _excelFunctionsExtendedRegistration);
330330

331331
// Register my Methods
332-
if (_excelFunctionExecutionHandlerSelectors.Count == 0)
333-
ExcelIntegration.RegisterMethods(_methods);
334-
else
335-
ExtendedRegistration.Registration.RegisterStandard(_methods.Select(i => new ExcelDna.Registration.ExcelFunctionRegistration(i)), _excelFunctionExecutionHandlerSelectors);
336-
337-
ExtendedRegistration.Registration.RegisterExtended(_excelFunctionsExtendedRegistration, _excelParameterConversions, _excelReturnConversions, _excelFunctionProcessors, _excelFunctionExecutionHandlerSelectors);
332+
var allMethods = _methods.Select(i => new Registration.ExcelFunctionRegistration(i)).Concat(_excelFunctionsExtendedRegistration);
333+
ExtendedRegistration.Registration.RegisterExtended(allMethods, _excelParameterConversions, _excelReturnConversions, _excelFunctionProcessors, _excelFunctionExecutionHandlerSelectors);
338334

339335
// Invoke AutoOpen in all assemblies
340336
foreach (AssemblyLoader.ExcelAddInInfo addIn in _addIns)
@@ -398,7 +394,7 @@ internal void AutoClose()
398394
internal void LoadCustomUI()
399395
{
400396
bool uiLoaded = false;
401-
397+
402398
// Load ComAddIns
403399
foreach (AssemblyLoader.ExcelAddInInfo addIn in _addIns)
404400
{

‎Source/ExcelDna.Integration/ExtendedRegistration/Registration.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ public static void RegisterExtended(IEnumerable<ExcelDna.Registration.ExcelFunct
2929
);
3030
}
3131

32-
public static void RegisterStandard(IEnumerable<ExcelDna.Registration.ExcelFunctionRegistration> functions, IEnumerable<FunctionExecutionHandlerSelector> excelFunctionExecutionHandlerSelectors)
33-
{
34-
var functionHandlerConfig = GetFunctionExecutionHandlerConfig(excelFunctionExecutionHandlerSelectors);
35-
36-
Register(functions
37-
.ProcessFunctionExecutionHandlers(functionHandlerConfig)
38-
);
39-
}
40-
4132
internal static void Register(IEnumerable<ExcelDna.Registration.ExcelFunctionRegistration> functions)
4233
{
4334
functions = functions.ToList();

‎Source/ExcelDna.sln

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -134,212 +134,138 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExcelDna.AddIn.RuntimeTests
134134
EndProject
135135
Global
136136
GlobalSection(SolutionConfigurationPlatforms) = preSolution
137-
Debug|Any CPU = Debug|Any CPU
138137
Debug|Win32 = Debug|Win32
139138
Debug|x64 = Debug|x64
140-
Release|Any CPU = Release|Any CPU
141139
Release|Win32 = Release|Win32
142140
Release|x64 = Release|x64
143141
EndGlobalSection
144142
GlobalSection(ProjectConfigurationPlatforms) = postSolution
145-
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146-
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Debug|Any CPU.Build.0 = Debug|Any CPU
147143
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Debug|Win32.ActiveCfg = Debug|Any CPU
148144
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Debug|Win32.Build.0 = Debug|Any CPU
149145
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Debug|x64.ActiveCfg = Debug|Any CPU
150146
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Debug|x64.Build.0 = Debug|Any CPU
151-
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Release|Any CPU.ActiveCfg = Release|Any CPU
152-
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Release|Any CPU.Build.0 = Release|Any CPU
153147
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Release|Win32.ActiveCfg = Release|Any CPU
154148
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Release|Win32.Build.0 = Release|Any CPU
155149
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Release|x64.ActiveCfg = Release|Any CPU
156150
{59AE5BC6-F37E-4CE3-BAE3-796F807A9882}.Release|x64.Build.0 = Release|Any CPU
157-
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Debug|Any CPU.ActiveCfg = Debug|x64
158-
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Debug|Any CPU.Build.0 = Debug|x64
159151
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Debug|Win32.ActiveCfg = Debug|Win32
160152
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Debug|Win32.Build.0 = Debug|Win32
161153
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Debug|x64.ActiveCfg = Debug|x64
162154
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Debug|x64.Build.0 = Debug|x64
163-
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Release|Any CPU.ActiveCfg = Release|x64
164-
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Release|Any CPU.Build.0 = Release|x64
165155
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Release|Win32.ActiveCfg = Release|Win32
166156
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Release|Win32.Build.0 = Release|Win32
167157
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Release|x64.ActiveCfg = Release|x64
168158
{A8D668E2-63C1-4F4E-A01E-E026C6E4D601}.Release|x64.Build.0 = Release|x64
169-
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
170-
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
171159
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Debug|Win32.ActiveCfg = Debug|Any CPU
172160
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Debug|Win32.Build.0 = Debug|Any CPU
173161
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Debug|x64.ActiveCfg = Debug|Any CPU
174162
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Debug|x64.Build.0 = Debug|Any CPU
175-
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
176-
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Release|Any CPU.Build.0 = Release|Any CPU
177163
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Release|Win32.ActiveCfg = Release|Any CPU
178164
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Release|Win32.Build.0 = Release|Any CPU
179165
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Release|x64.ActiveCfg = Release|Any CPU
180166
{196735BC-5A5C-4A21-9FE4-EC01CB7F3DE9}.Release|x64.Build.0 = Release|Any CPU
181-
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
182-
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
183167
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Debug|Win32.ActiveCfg = Debug|Any CPU
184168
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Debug|Win32.Build.0 = Debug|Any CPU
185169
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Debug|x64.ActiveCfg = Debug|Any CPU
186170
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Debug|x64.Build.0 = Debug|Any CPU
187-
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
188-
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Release|Any CPU.Build.0 = Release|Any CPU
189171
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Release|Win32.ActiveCfg = Release|Any CPU
190172
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Release|Win32.Build.0 = Release|Any CPU
191173
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Release|x64.ActiveCfg = Release|Any CPU
192174
{FD7F2EE3-9922-4825-96A2-BE2C877BAEB9}.Release|x64.Build.0 = Release|Any CPU
193-
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
194-
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Debug|Any CPU.Build.0 = Debug|Any CPU
195175
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Debug|Win32.ActiveCfg = Debug|Any CPU
196176
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Debug|Win32.Build.0 = Debug|Any CPU
197177
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Debug|x64.ActiveCfg = Debug|Any CPU
198178
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Debug|x64.Build.0 = Debug|Any CPU
199-
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Release|Any CPU.ActiveCfg = Release|Any CPU
200-
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Release|Any CPU.Build.0 = Release|Any CPU
201179
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Release|Win32.ActiveCfg = Release|Any CPU
202180
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Release|Win32.Build.0 = Release|Any CPU
203181
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Release|x64.ActiveCfg = Release|Any CPU
204182
{B5CC04D3-0507-4431-9F45-7C60BAC3047A}.Release|x64.Build.0 = Release|Any CPU
205-
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
206-
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Debug|Any CPU.Build.0 = Debug|Any CPU
207183
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Debug|Win32.ActiveCfg = Debug|Any CPU
208184
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Debug|Win32.Build.0 = Debug|Any CPU
209185
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Debug|x64.ActiveCfg = Debug|Any CPU
210186
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Debug|x64.Build.0 = Debug|Any CPU
211-
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Release|Any CPU.ActiveCfg = Release|Any CPU
212-
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Release|Any CPU.Build.0 = Release|Any CPU
213187
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Release|Win32.ActiveCfg = Release|Any CPU
214188
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Release|Win32.Build.0 = Release|Any CPU
215189
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Release|x64.ActiveCfg = Release|Any CPU
216190
{C9CAD3E4-E6F1-4BD2-AF89-57950AB15388}.Release|x64.Build.0 = Release|Any CPU
217-
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
218-
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
219191
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Debug|Win32.ActiveCfg = Debug|Any CPU
220192
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Debug|x64.ActiveCfg = Debug|Any CPU
221193
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Debug|x64.Build.0 = Debug|Any CPU
222-
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
223-
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Release|Any CPU.Build.0 = Release|Any CPU
224194
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Release|Win32.ActiveCfg = Release|Any CPU
225195
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Release|x64.ActiveCfg = Release|Any CPU
226196
{3AFD9408-48AC-43B4-8E55-4E7D73168FEA}.Release|x64.Build.0 = Release|Any CPU
227-
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
228-
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
229197
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Debug|Win32.ActiveCfg = Debug|Any CPU
230198
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Debug|Win32.Build.0 = Debug|Any CPU
231199
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Debug|x64.ActiveCfg = Debug|Any CPU
232200
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Debug|x64.Build.0 = Debug|Any CPU
233-
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
234-
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Release|Any CPU.Build.0 = Release|Any CPU
235201
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Release|Win32.ActiveCfg = Release|Any CPU
236202
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Release|Win32.Build.0 = Release|Any CPU
237203
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Release|x64.ActiveCfg = Release|Any CPU
238204
{DC10CEC8-C6CE-4148-838F-C3DD4EA2A2A3}.Release|x64.Build.0 = Release|Any CPU
239-
{A9887347-3E93-4E4E-96DF-227648E57B60}.Debug|Any CPU.ActiveCfg = Debug|x64
240-
{A9887347-3E93-4E4E-96DF-227648E57B60}.Debug|Any CPU.Build.0 = Debug|x64
241205
{A9887347-3E93-4E4E-96DF-227648E57B60}.Debug|Win32.ActiveCfg = Debug|Win32
242206
{A9887347-3E93-4E4E-96DF-227648E57B60}.Debug|Win32.Build.0 = Debug|Win32
243207
{A9887347-3E93-4E4E-96DF-227648E57B60}.Debug|x64.ActiveCfg = Debug|x64
244208
{A9887347-3E93-4E4E-96DF-227648E57B60}.Debug|x64.Build.0 = Debug|x64
245-
{A9887347-3E93-4E4E-96DF-227648E57B60}.Release|Any CPU.ActiveCfg = Release|x64
246-
{A9887347-3E93-4E4E-96DF-227648E57B60}.Release|Any CPU.Build.0 = Release|x64
247209
{A9887347-3E93-4E4E-96DF-227648E57B60}.Release|Win32.ActiveCfg = Release|Win32
248210
{A9887347-3E93-4E4E-96DF-227648E57B60}.Release|Win32.Build.0 = Release|Win32
249211
{A9887347-3E93-4E4E-96DF-227648E57B60}.Release|x64.ActiveCfg = Release|x64
250212
{A9887347-3E93-4E4E-96DF-227648E57B60}.Release|x64.Build.0 = Release|x64
251-
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
252-
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Debug|Any CPU.Build.0 = Debug|Any CPU
253213
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Debug|Win32.ActiveCfg = Debug|Any CPU
254214
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Debug|x64.ActiveCfg = Debug|Any CPU
255215
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Debug|x64.Build.0 = Debug|Any CPU
256-
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Release|Any CPU.ActiveCfg = Release|Any CPU
257-
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Release|Any CPU.Build.0 = Release|Any CPU
258216
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Release|Win32.ActiveCfg = Release|Any CPU
259217
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Release|x64.ActiveCfg = Release|Any CPU
260218
{BA1BBC2E-E1A6-4682-8901-F596A21FD253}.Release|x64.Build.0 = Release|Any CPU
261-
{28D046D4-B414-4DAF-818F-897A97B921DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
262-
{28D046D4-B414-4DAF-818F-897A97B921DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
263219
{28D046D4-B414-4DAF-818F-897A97B921DF}.Debug|Win32.ActiveCfg = Debug|Any CPU
264220
{28D046D4-B414-4DAF-818F-897A97B921DF}.Debug|Win32.Build.0 = Debug|Any CPU
265221
{28D046D4-B414-4DAF-818F-897A97B921DF}.Debug|x64.ActiveCfg = Debug|Any CPU
266222
{28D046D4-B414-4DAF-818F-897A97B921DF}.Debug|x64.Build.0 = Debug|Any CPU
267-
{28D046D4-B414-4DAF-818F-897A97B921DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
268-
{28D046D4-B414-4DAF-818F-897A97B921DF}.Release|Any CPU.Build.0 = Release|Any CPU
269223
{28D046D4-B414-4DAF-818F-897A97B921DF}.Release|Win32.ActiveCfg = Release|Any CPU
270224
{28D046D4-B414-4DAF-818F-897A97B921DF}.Release|Win32.Build.0 = Release|Any CPU
271225
{28D046D4-B414-4DAF-818F-897A97B921DF}.Release|x64.ActiveCfg = Release|Any CPU
272226
{28D046D4-B414-4DAF-818F-897A97B921DF}.Release|x64.Build.0 = Release|Any CPU
273-
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
274-
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Debug|Any CPU.Build.0 = Debug|Any CPU
275227
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Debug|Win32.ActiveCfg = Debug|Any CPU
276228
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Debug|x64.ActiveCfg = Debug|Any CPU
277229
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Debug|x64.Build.0 = Debug|Any CPU
278-
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Release|Any CPU.ActiveCfg = Release|Any CPU
279-
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Release|Any CPU.Build.0 = Release|Any CPU
280230
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Release|Win32.ActiveCfg = Release|Any CPU
281231
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Release|x64.ActiveCfg = Release|Any CPU
282232
{297D72F7-FD48-4751-B2EF-F97DBAD0C901}.Release|x64.Build.0 = Release|Any CPU
283-
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
284-
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Debug|Any CPU.Build.0 = Debug|Any CPU
285233
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Debug|Win32.ActiveCfg = Debug|Any CPU
286234
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Debug|Win32.Build.0 = Debug|Any CPU
287235
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Debug|x64.ActiveCfg = Debug|Any CPU
288236
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Debug|x64.Build.0 = Debug|Any CPU
289-
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Release|Any CPU.ActiveCfg = Release|Any CPU
290-
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Release|Any CPU.Build.0 = Release|Any CPU
291237
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Release|Win32.ActiveCfg = Release|Any CPU
292238
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Release|Win32.Build.0 = Release|Any CPU
293239
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Release|x64.ActiveCfg = Release|Any CPU
294240
{238F95C5-87DF-4973-88C2-5A9509C3935F}.Release|x64.Build.0 = Release|Any CPU
295-
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
296-
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Debug|Any CPU.Build.0 = Debug|Any CPU
297241
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Debug|Win32.ActiveCfg = Debug|Any CPU
298242
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Debug|x64.ActiveCfg = Debug|Any CPU
299243
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Debug|x64.Build.0 = Debug|Any CPU
300-
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Release|Any CPU.ActiveCfg = Release|Any CPU
301-
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Release|Any CPU.Build.0 = Release|Any CPU
302244
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Release|Win32.ActiveCfg = Release|Any CPU
303245
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Release|x64.ActiveCfg = Release|Any CPU
304246
{8D04B68B-1EFE-48DC-A0B5-D7ACC293694B}.Release|x64.Build.0 = Release|Any CPU
305-
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
306-
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
307247
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Debug|Win32.ActiveCfg = Debug|Any CPU
308248
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Debug|x64.ActiveCfg = Debug|Any CPU
309249
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Debug|x64.Build.0 = Debug|Any CPU
310-
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
311-
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Release|Any CPU.Build.0 = Release|Any CPU
312250
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Release|Win32.ActiveCfg = Release|Any CPU
313251
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Release|x64.ActiveCfg = Release|Any CPU
314252
{55AEB960-2857-323E-3E82-5A8AA5913A18}.Release|x64.Build.0 = Release|Any CPU
315-
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
316-
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
317253
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Debug|Win32.ActiveCfg = Debug|Any CPU
318254
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Debug|x64.ActiveCfg = Debug|Any CPU
319255
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Debug|x64.Build.0 = Debug|Any CPU
320-
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
321-
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Release|Any CPU.Build.0 = Release|Any CPU
322256
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Release|Win32.ActiveCfg = Release|Any CPU
323257
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Release|x64.ActiveCfg = Release|Any CPU
324258
{2F5539CC-E302-49B6-88A9-9264DC6413B3}.Release|x64.Build.0 = Release|Any CPU
325-
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
326-
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Debug|Any CPU.Build.0 = Debug|Any CPU
327259
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Debug|Win32.ActiveCfg = Debug|Any CPU
328260
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Debug|x64.ActiveCfg = Debug|Any CPU
329261
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Debug|x64.Build.0 = Debug|Any CPU
330-
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Release|Any CPU.ActiveCfg = Release|Any CPU
331-
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Release|Any CPU.Build.0 = Release|Any CPU
332262
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Release|Win32.ActiveCfg = Release|Any CPU
333263
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Release|x64.ActiveCfg = Release|Any CPU
334264
{7CA501E1-FB74-4903-B34D-EFE513C5B428}.Release|x64.Build.0 = Release|Any CPU
335-
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
336-
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
337265
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Debug|Win32.ActiveCfg = Debug|Any CPU
338266
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Debug|Win32.Build.0 = Debug|Any CPU
339267
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Debug|x64.ActiveCfg = Debug|Any CPU
340268
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Debug|x64.Build.0 = Debug|Any CPU
341-
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
342-
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Release|Any CPU.Build.0 = Release|Any CPU
343269
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Release|Win32.ActiveCfg = Release|Any CPU
344270
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Release|Win32.Build.0 = Release|Any CPU
345271
{151AE960-6320-402D-BDD0-D76DF96F2BD7}.Release|x64.ActiveCfg = Release|Any CPU

‎Source/Tests/ExcelDna.AddIn.RuntimeTests/ExclamationFunctionRegistration.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using ExcelDna.Integration;
2+
using System.Linq.Expressions;
3+
4+
namespace ExcelDna.AddIn.RuntimeTests
5+
{
6+
internal static class ExclamationFunctionRegistration
7+
{
8+
[ExcelFunctionProcessor]
9+
public static IEnumerable<IExcelFunctionInfo> ProcessExclamationFunctions(IEnumerable<IExcelFunctionInfo> registrations, IExcelFunctionRegistrationConfiguration config)
10+
{
11+
foreach (var reg in registrations)
12+
{
13+
if (reg.FunctionAttribute.Name == "MySayHelloWithExclamation")
14+
{
15+
var concatMethod = typeof(string).GetMethod("Concat", new[] { typeof(string), typeof(string) });
16+
var newBody = Expression.Call(concatMethod!, reg.FunctionLambda.Body, Expression.Constant("!"));
17+
reg.FunctionLambda = Expression.Lambda<Func<string, string>>(newBody, reg.FunctionLambda.Parameters);
18+
}
19+
20+
yield return reg;
21+
}
22+
}
23+
}
24+
}

‎Source/Tests/ExcelDna.AddIn.RuntimeTests/MyFunctions.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ public static string SayHello(string name)
1313
return $"Hello {name}";
1414
}
1515

16+
[ExcelFunction]
17+
public static string MySayHelloWithExclamation(string name)
18+
{
19+
return $"Hello with exclamation {name}";
20+
}
21+
1622
[ExcelFunction, Logging(7)]
1723
public static string SayHelloWithLoggingID(string name)
1824
{

0 commit comments

Comments
 (0)