Update testwinrt and clean up redundant code

microsoft · Sep 30, 2020 · cac5a23 · cac5a23
1 parent 7a5eb27
commit cac5a23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 32 deletions.
diff --git a/cswinrt/code_writers.h b/cswinrt/code_writers.h
@@ -2313,21 +2313,7 @@ event % %;)",
  set_simple_marshaler_type(m, type);
  break;
  case category::interface_type:
- // TODO: review the need for target & namespace specific behavior
- if (settings.netstandard_compat) {
- if (get_mapped_type(type.TypeNamespace(), type.TypeName()) &&
- type.TypeNamespace() == "Windows.Foundation.Collections")
- {
- m.marshaler_type = get_abi_type();
- }
- else
- {
- m.marshaler_type = "MarshalInterface<" + m.param_type + ">";
- }
- }
- else {
- m.marshaler_type = "MarshalInterface<" + m.param_type + ">";
- }
+ m.marshaler_type = "MarshalInterface<" + m.param_type + ">"; 
  if (m.is_array())
  {
  m.local_type = w.write_temp("MarshalInterfaceHelper<%>.MarshalerArray", m.param_type);
@@ -3531,22 +3517,7 @@ remove => %.Unsubscribe(value);
  }
  break;
  case category::interface_type:
- // TODO: review the need for target & namespace specific behavior
- if (settings.netstandard_compat)
- {
- if (get_mapped_type(type.TypeNamespace(), type.TypeName()) &&
- type.TypeNamespace() == "Windows.Foundation.Collections")
- {
- m.marshaler_type = get_abi_type();
- }
- else
- {
- m.marshaler_type = w.write_temp("MarshalInterface<%>", m.param_type);
- }
- }
- else {
- m.marshaler_type = w.write_temp("MarshalInterface<%>", m.param_type);
- }
+ m.marshaler_type = w.write_temp("MarshalInterface<%>", m.param_type);
  m.local_type = m.param_type;
  break;
  case category::class_type:

diff --git a/get_testwinrt.cmd b/get_testwinrt.cmd
@@ -12,7 +12,7 @@ git checkout -f master
 if ErrorLevel 1 popd & exit /b !ErrorLevel!
 git fetch -f
 if ErrorLevel 1 popd & exit /b !ErrorLevel!
-git reset -q --hard e058f2fc16e4812a16b5453da7ef4d65b3cf0bfe
+git reset -q --hard 5cc3911373ac6ceac3aec2d5983fec0155d5e4e3
 if ErrorLevel 1 popd & exit /b !ErrorLevel!
 echo Restoring Nuget
 ..\.nuget\nuget.exe restore