Skip to content

Commit 789dcaf

Browse files
authored
Merge pull request NetOfficeFw#391 from NetOfficeFw/dev/283_remove_dynamics
Remove dynamic types and duck code
2 parents 1f719bf + cc6a671 commit 789dcaf

File tree

696 files changed

+1241
-8990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

696 files changed

+1241
-8990
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## v2.0.0-preview
4+
5+
### Breaking Changes
6+
* Remove "duck tales" and dynamics implementations [#283](https://github.com/NetOfficeFw/NetOffice/issues/283)
7+
Affected types:
8+
* removed all types from namespace `NetOffice.DuckTales`
9+
* classes `COMDynamicObject`, `DuckException`, `COMDynamicObjectExpandableObjectConverter`, `COMObjectExpandableObjectConverter`, `ExpandableSettingsConverter`
10+
* event `OnCreateCOMDynamicEvent`
11+
12+
313
## v1.9.3
414

515
### Fixed

Source/ADODB/DispatchInterfaces/Fields.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ public void CancelUpdate()
257257

258258
ICOMObject IEnumerableProvider<NetOffice.ADODBApi.Field>.GetComObjectEnumerator(ICOMObject parent)
259259
{
260-
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this, false);
260+
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this);
261261
}
262262

263263
IEnumerable IEnumerableProvider<NetOffice.ADODBApi.Field>.FetchVariantComObjectEnumerator(ICOMObject parent, ICOMObject enumerator)
@@ -290,7 +290,7 @@ public void CancelUpdate()
290290
[SupportByVersion("ADODB", 2.1,2.5)]
291291
IEnumerator NetRuntimeSystem.Collections.IEnumerable.GetEnumerator()
292292
{
293-
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this, false);
293+
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this);
294294
}
295295

296296
#endregion

Source/ADODB/DispatchInterfaces/Fields20.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void Delete(object index)
193193

194194
ICOMObject IEnumerableProvider<object>.GetComObjectEnumerator(ICOMObject parent)
195195
{
196-
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this, false);
196+
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this);
197197
}
198198

199199
IEnumerable IEnumerableProvider<object>.FetchVariantComObjectEnumerator(ICOMObject parent, ICOMObject enumerator)
@@ -226,7 +226,7 @@ public IEnumerator<object> GetEnumerator()
226226
[SupportByVersion("ADODB", 2.5)]
227227
IEnumerator NetRuntimeSystem.Collections.IEnumerable.GetEnumerator()
228228
{
229-
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this, true);
229+
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this);
230230
}
231231

232232
#endregion

Source/ADODB/DispatchInterfaces/Fields20_Deprecated.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void Delete(object index)
193193

194194
ICOMObject IEnumerableProvider<object>.GetComObjectEnumerator(ICOMObject parent)
195195
{
196-
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this, false);
196+
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this);
197197
}
198198

199199
IEnumerable IEnumerableProvider<object>.FetchVariantComObjectEnumerator(ICOMObject parent, ICOMObject enumerator)
@@ -226,7 +226,7 @@ public IEnumerator<object> GetEnumerator()
226226
[SupportByVersion("ADODB", 2.5)]
227227
IEnumerator NetRuntimeSystem.Collections.IEnumerable.GetEnumerator()
228228
{
229-
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this, true);
229+
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this);
230230
}
231231

232232
#endregion

Source/ADODB/DispatchInterfaces/Fields_Deprecated.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public void CancelUpdate()
248248

249249
ICOMObject IEnumerableProvider<NetOffice.ADODBApi.Field_Deprecated>.GetComObjectEnumerator(ICOMObject parent)
250250
{
251-
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this, false);
251+
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this);
252252
}
253253

254254
IEnumerable IEnumerableProvider<NetOffice.ADODBApi.Field_Deprecated>.FetchVariantComObjectEnumerator(ICOMObject parent, ICOMObject enumerator)
@@ -281,7 +281,7 @@ public void CancelUpdate()
281281
[SupportByVersion("ADODB", 2.5)]
282282
IEnumerator NetRuntimeSystem.Collections.IEnumerable.GetEnumerator()
283283
{
284-
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this, false);
284+
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this);
285285
}
286286

287287
#endregion

Source/ADODB/DispatchInterfaces/Parameters.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public NetOffice.ADODBApi._Parameter this[object index]
136136

137137
ICOMObject IEnumerableProvider<NetOffice.ADODBApi._Parameter>.GetComObjectEnumerator(ICOMObject parent)
138138
{
139-
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this, false);
139+
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this);
140140
}
141141

142142
IEnumerable IEnumerableProvider<NetOffice.ADODBApi._Parameter>.FetchVariantComObjectEnumerator(ICOMObject parent, ICOMObject enumerator)
@@ -169,7 +169,7 @@ public NetOffice.ADODBApi._Parameter this[object index]
169169
[SupportByVersion("ADODB", 2.1,2.5)]
170170
IEnumerator NetRuntimeSystem.Collections.IEnumerable.GetEnumerator()
171171
{
172-
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this, false);
172+
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this);
173173
}
174174

175175
#endregion

Source/ADODB/DispatchInterfaces/Parameters_Deprecated.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void Refresh()
157157

158158
ICOMObject IEnumerableProvider<NetOffice.ADODBApi._Parameter_Deprecated>.GetComObjectEnumerator(ICOMObject parent)
159159
{
160-
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this, false);
160+
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this);
161161
}
162162

163163
IEnumerable IEnumerableProvider<NetOffice.ADODBApi._Parameter_Deprecated>.FetchVariantComObjectEnumerator(ICOMObject parent, ICOMObject enumerator)
@@ -190,7 +190,7 @@ public void Refresh()
190190
[SupportByVersion("ADODB", 2.5)]
191191
IEnumerator NetRuntimeSystem.Collections.IEnumerable.GetEnumerator()
192192
{
193-
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this, false);
193+
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this);
194194
}
195195

196196
#endregion

Source/ADODB/DispatchInterfaces/_Collection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void Refresh()
142142

143143
ICOMObject IEnumerableProvider<object>.GetComObjectEnumerator(ICOMObject parent)
144144
{
145-
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this, false);
145+
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this);
146146
}
147147

148148
IEnumerable IEnumerableProvider<object>.FetchVariantComObjectEnumerator(ICOMObject parent, ICOMObject enumerator)
@@ -175,7 +175,7 @@ public IEnumerator<object> GetEnumerator()
175175
[SupportByVersion("ADODB", 2.1,2.5)]
176176
IEnumerator NetRuntimeSystem.Collections.IEnumerable.GetEnumerator()
177177
{
178-
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this, true);
178+
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this);
179179
}
180180

181181
#endregion

Source/ADODB/Utils/ProjectInfo.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ public string[] Dependencies
8686
}
8787
}
8888

89-
public bool IsDuck
90-
{
91-
get
92-
{
93-
return false;
94-
}
95-
}
96-
9789
public bool Contains(Type type)
9890
{
9991
if (null == _exportedTypes)

Source/Access/DispatchInterfaces/AccessObjectProperties.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public bool IsMemberSafe(Int32 dispid)
213213

214214
ICOMObject IEnumerableProvider<NetOffice.AccessApi.AccessObjectProperty>.GetComObjectEnumerator(ICOMObject parent)
215215
{
216-
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this, false);
216+
return NetOffice.Utils.GetComObjectEnumeratorAsMethod(parent, this);
217217
}
218218

219219
IEnumerable IEnumerableProvider<NetOffice.AccessApi.AccessObjectProperty>.FetchVariantComObjectEnumerator(ICOMObject parent, ICOMObject enumerator)
@@ -246,7 +246,7 @@ public bool IsMemberSafe(Int32 dispid)
246246
[SupportByVersion("Access", 9,10,11,12,14,15,16)]
247247
IEnumerator NetRuntimeSystem.Collections.IEnumerable.GetEnumerator()
248248
{
249-
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this, false);
249+
return NetOffice.Utils.GetProxyEnumeratorAsMethod(this);
250250
}
251251

252252
#endregion

0 commit comments

Comments
 (0)