Undid changes not required for the fix

microsoft · Nov 10, 2020 · 8619e44 · 8619e44
1 parent 642c651
commit 8619e44
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 24 deletions.
diff --git a/TestComponentCSharp/TestComponentCSharp.idl b/TestComponentCSharp/TestComponentCSharp.idl
@@ -366,12 +366,6 @@ namespace TestComponentCSharp
  IDisposableTest();
  }
 
- [default_interface]
- runtimeclass IEnumerableTest //: Windows.Foundation.Collections.IIterable
- {
- //IEnumerableTest();
- }
-
  // IInspectable-based interop interface
  [uuid(39E050C3-4E74-441A-8DC0-B81104DF949C)]
  interface IUserConsentVerifierInterop

diff --git a/UnitTest/TestComponentCSharp_Tests.cs b/UnitTest/TestComponentCSharp_Tests.cs
@@ -2174,7 +2174,7 @@ public void TestNonProjectedRuntimeClass()
  Assert.NotNull(cryptoKey);
  }
 
- [Fact]
+ [Fact(Skip="Operation not supported")]
  public void TestIBindableIterator()
  {
  IBindableIteratorTest bindableIterator = new IBindableIteratorTest();

diff --git a/WinRT.Runtime/Projections.cs b/WinRT.Runtime/Projections.cs
@@ -65,13 +65,12 @@ static Projections()
  RegisterCustomAbiTypeMappingNoLock(typeof(Vector3), typeof(ABI.System.Numerics.Vector3), "Windows.Foundation.Numerics.Vector3");
  RegisterCustomAbiTypeMappingNoLock(typeof(Vector4), typeof(ABI.System.Numerics.Vector4), "Windows.Foundation.Numerics.Vector4");
 
+ // TODO: Ideally we should not need these
  CustomTypeToHelperTypeMappings.Add(typeof(IMap<,>), typeof(ABI.System.Collections.Generic.IDictionary<,>));
  CustomTypeToHelperTypeMappings.Add(typeof(IVector<>), typeof(ABI.System.Collections.Generic.IList<>));
  CustomTypeToHelperTypeMappings.Add(typeof(IMapView<,>), typeof(ABI.System.Collections.Generic.IReadOnlyDictionary<,>));
  CustomTypeToHelperTypeMappings.Add(typeof(IVectorView<>), typeof(ABI.System.Collections.Generic.IReadOnlyList<>));
  CustomTypeToHelperTypeMappings.Add(typeof(global::Microsoft.UI.Xaml.Interop.IBindableVector), typeof(ABI.System.Collections.IList));
- CustomTypeToHelperTypeMappings.Add(typeof(IIterable<>), typeof(global::ABI.System.Collections.Generic.IEnumerable<>));
- CustomTypeToHelperTypeMappings.Add(typeof(IIterator<>), typeof(global::ABI.System.Collections.Generic.IEnumerator<>));
 
  CustomTypeToAbiTypeNameMappings.Add(typeof(System.Type), "Windows.UI.Xaml.Interop.TypeName");
  }

diff --git a/WinRT.Runtime/Projections/IDictionary.net5.cs b/WinRT.Runtime/Projections/IDictionary.net5.cs
@@ -14,13 +14,13 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
+ //Need to rethink how to name/define this interface
  [Guid("3C2925FE-8519-45C1-AA79-197B6718C1C1")]
  interface IMap<K, V> : IIterable<IKeyValuePair<K, V>>
  {
  V Lookup(K key);
  bool HasKey(K key);
- IReadOnlyDictionary<K, V> GetView();
+ IReadOnlyDictionary<K, V> GetView(); 
  bool Insert(K key, V value);
  void _Remove(K key);
  void Clear();
@@ -33,6 +33,7 @@ namespace ABI.System.Collections.Generic
  using global::System;
  using global::System.Runtime.CompilerServices;
 
+ //This interface does not need to implement IMapView. Needs to be refactored
  [DynamicInterfaceCastableImplementation]
  [Guid("3C2925FE-8519-45C1-AA79-197B6718C1C1")]
  interface IDictionary<K, V> : global::System.Collections.Generic.IDictionary<K, V>, global::Windows.Foundation.Collections.IMap<K, V>

diff --git a/WinRT.Runtime/Projections/IDictionary.netstandard2.0.cs b/WinRT.Runtime/Projections/IDictionary.netstandard2.0.cs
@@ -14,13 +14,12 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
  [Guid("3C2925FE-8519-45C1-AA79-197B6718C1C1")]
  interface IMap<K, V> : IIterable<IKeyValuePair<K, V>>
  {
  V Lookup(K key);
  bool HasKey(K key);
- IReadOnlyDictionary<K, V> GetView();
+ IReadOnlyDictionary<K, V> GetView(); //TODO: Needs to be updated
  bool Insert(K key, V value);
  void _Remove(K key);
  void Clear();

diff --git a/WinRT.Runtime/Projections/IEnumerable.net5.cs b/WinRT.Runtime/Projections/IEnumerable.net5.cs
@@ -15,14 +15,14 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
+
  [Guid("FAA585EA-6214-4217-AFDA-7F46DE5869B3")]
  internal interface IIterable<T>
  {
  IEnumerator<T> First();
  }
 
- [global::WinRT.WindowsRuntimeType]
+
  [Guid("6A79E863-4300-459A-9966-CBB660963EE1")]
  internal interface IIterator<T>
  {

diff --git a/WinRT.Runtime/Projections/IEnumerable.netstandard2.0.cs b/WinRT.Runtime/Projections/IEnumerable.netstandard2.0.cs
@@ -15,14 +15,14 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
+
  [Guid("FAA585EA-6214-4217-AFDA-7F46DE5869B3")]
  internal interface IIterable<T>
  {
  IEnumerator<T> First();
  }
 
- [global::WinRT.WindowsRuntimeType]
+
  [Guid("6A79E863-4300-459A-9966-CBB660963EE1")]
  internal interface IIterator<T>
  {

diff --git a/WinRT.Runtime/Projections/IList.net5.cs b/WinRT.Runtime/Projections/IList.net5.cs
@@ -14,7 +14,7 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
+
  [Guid("913337E9-11A1-4345-A3A2-4E7F956E222D")]
  interface IVector<T> : IIterable<T>
  {

diff --git a/WinRT.Runtime/Projections/IList.netstandard2.0.cs b/WinRT.Runtime/Projections/IList.netstandard2.0.cs
@@ -14,7 +14,7 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
+
  [Guid("913337E9-11A1-4345-A3A2-4E7F956E222D")]
  interface IVector<T> : IIterable<T>
  {

diff --git a/WinRT.Runtime/Projections/IReadOnlyDictionary.net5.cs b/WinRT.Runtime/Projections/IReadOnlyDictionary.net5.cs
@@ -14,7 +14,7 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
+
  [Guid("E480CE40-A338-4ADA-ADCF-272272E48CB9")]
  interface IMapView<K, V> : IIterable<IKeyValuePair<K, V>>
  {

diff --git a/WinRT.Runtime/Projections/IReadOnlyDictionary.netstandard2.0.cs b/WinRT.Runtime/Projections/IReadOnlyDictionary.netstandard2.0.cs
@@ -14,7 +14,6 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
  [Guid("E480CE40-A338-4ADA-ADCF-272272E48CB9")]
  interface IMapView<K, V> : IIterable<IKeyValuePair<K, V>>
  {

diff --git a/WinRT.Runtime/Projections/IReadOnlyList.net5.cs b/WinRT.Runtime/Projections/IReadOnlyList.net5.cs
@@ -14,7 +14,6 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
  [Guid("BBE1FA4C-B0E3-4583-BAEF-1F1B2E483E56")]
  interface IVectorView<T> : IIterable<T>
  {

diff --git a/WinRT.Runtime/Projections/IReadOnlyList.netstandard2.0.cs b/WinRT.Runtime/Projections/IReadOnlyList.netstandard2.0.cs
@@ -14,7 +14,6 @@
 
 namespace Windows.Foundation.Collections
 {
- [global::WinRT.WindowsRuntimeType]
  [Guid("BBE1FA4C-B0E3-4583-BAEF-1F1B2E483E56")]
  interface IVectorView<T> : IIterable<T>
  {

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 5cc3911373ac6ceac3aec2d5983fec0155d5e4e3
+git reset -q --hard 5df065fd3bccf314079e39e1bf2644fd239615c1
 if ErrorLevel 1 popd & exit /b !ErrorLevel!
 echo Restoring Nuget
 ..\.nuget\nuget.exe restore