Merge branch 'master' into uwp

Author: robmikh

Cargo.lock

@@ -5,12 +5,12 @@ authors = ["Robert Mikhayelyan <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-windows = { git = "https://github.com/microsoft/windows-rs" }
+windows = "0.18.0"
 bindings = { path = "bindings" }
-rand = "0.7.3"
+rand = "0.8.3"
 
 [target.'cfg(target_vendor = "pc")'.dependencies]
-winit = "0.22.2"
+winit = "0.24.0"
 raw-window-handle = "0.3.3"
 
 [features]

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-windows = { git = "https://github.com/microsoft/windows-rs" }
+windows = "0.18.0"
 
 [build-dependencies]
-windows = { git = "https://github.com/microsoft/windows-rs" }
+windows = "0.18.0"

bindings/Cargo.lock

@@ -1,37 +1,26 @@
 fn main() {
-    windows::build!(
-        windows::application_model::core::{
-            CoreApplication,
-            CoreApplicationView,
-            IFrameworkViewSource,
-            IFrameworkView,
-        }
-        windows::foundation::numerics::{Vector2, Vector3}
-        windows::foundation::TimeSpan
-        windows::graphics::SizeInt32
-        windows::system::DispatcherQueueController
-        windows::ui::composition::{
-            AnimationIterationBehavior,
-            CompositionBatchTypes,
-            CompositionBorderMode,
-            CompositionColorBrush,
-            CompositionGeometry,
-            CompositionShape,
-            CompositionSpriteShape,
-            Compositor,
-            ContainerVisual,
-            SpriteVisual,
-        }
-        windows::ui::composition::desktop::DesktopWindowTarget
-        windows::ui::Colors
-        windows::ui::core::{
-            CoreDispatcher,
-            CoreWindow,
-            CoreProcessEventsOption,
-            WindowSizeChangedEventArgs,
+    windows::build! {
+        Windows::ApplicationModel::Core::{
+            CoreApplication, CoreApplicationView, IFrameworkViewSource, IFrameworkView,
+        },
+        Windows::Graphics::SizeInt32,
+        Windows::Win32::System::WinRT::{
+            CreateDispatcherQueueController, ICompositorDesktopInterop, RoInitialize,
+        },
+        Windows::UI::Colors,
+        Windows::UI::Composition::Desktop::DesktopWindowTarget,
+        Windows::UI::Composition::{
+            CompositionColorBrush, CompositionContainerShape, CompositionEllipseGeometry,
+            CompositionNineGridBrush, CompositionScopedBatch, CompositionShapeCollection,
+            CompositionSpriteShape, Compositor, ShapeVisual, SpriteVisual,
+            Vector3KeyFrameAnimation, VisualCollection,
+        },
+        Windows::UI::Core::{
+            CoreDispatcher, CoreWindow, CoreProcessEventsOption, WindowSizeChangedEventArgs,
             PointerEventArgs,
-        }
-        windows::win32::system_services::CreateDispatcherQueueController
-        windows::win32::winrt::{ICompositorDesktopInterop, RoInitialize}
-    );
+        },
+        Windows::UI::Input::{
+            PointerPoint, PointerPointProperties,
+        },
+    };
 }