Support Windows App SDK 1.0.3 (#39)

.github/readme.md

@@ -19,7 +19,7 @@ features = [
 ]
 
 [dependencies.windows]
-version = "0.34.0"
+version = "0.35.0"
 
 [dependencies.windows-app]
 git = "https://github.com/microsoft/windows-app-rs"

.github/workflows/build.yml

@@ -31,8 +31,8 @@ jobs:
     - run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
     - run: rustup target add ${{ matrix.other }}
 
-    - name: windows build
-      run: cargo test --all --target ${{ matrix.other }}
+    - name: windows-app build
+      run: cargo test --workspace --target ${{ matrix.other }} --exclude sample_xamlapp
 
   cargo_fmt:
     runs-on: windows-latest
@@ -48,4 +48,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Run cargo doc
-      run: cargo doc --no-deps --workspace
+      run: cargo doc --no-deps --workspace --exclude sample_xamlapp

.metadata/generate.proj

@@ -1,13 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<Project Sdk="Microsoft.Windows.WinmdGenerator/0.15.49-preview">
+<Project Sdk="Microsoft.Windows.WinmdGenerator/0.22.14-preview">
 
     <PropertyGroup Label="Globals">
         <OutputWinmd>../.windows/winmd/Microsoft.WindowsAppSdk.Generated.winmd</OutputWinmd>
-        <WinmdVersion>2.0.0</WinmdVersion>
+        <WinmdVersion>255.255.255.255</WinmdVersion>
         <ExcludeFromCrossarch>Microsoft.MRM;Microsoft.UI.Xaml;Microsoft.UI.Xaml.Hosting;Microsoft.UI.Xaml.Media;Microsoft.WindowsAppSdk.Foundation</ExcludeFromCrossarch>
     </PropertyGroup>
 
+    <Target Name="UpdateCrateBootstrap" AfterTargets="Build">
+        <Copy
+            SourceFiles="$(PkgMicrosoft_WindowsAppSDK)\lib\win10-arm64\Microsoft.WindowsAppRuntime.Bootstrap.lib"
+            DestinationFolder="../crates/targets/aarch64_msvc/lib"
+        />
+        <Copy
+            SourceFiles="$(PkgMicrosoft_WindowsAppSDK)\runtimes\win10-arm64\native\Microsoft.WindowsAppRuntime.Bootstrap.dll"
+            DestinationFolder="../crates/tools/api/bootstrap/arm64"
+        />
+        <Copy
+            SourceFiles="$(PkgMicrosoft_WindowsAppSDK)\lib\win10-x64\Microsoft.WindowsAppRuntime.Bootstrap.lib"
+            DestinationFolder="../crates/targets/x86_64_msvc/lib"
+        />
+        <Copy
+            SourceFiles="$(PkgMicrosoft_WindowsAppSDK)\runtimes\win10-x64\native\Microsoft.WindowsAppRuntime.Bootstrap.dll"
+            DestinationFolder="../crates/tools/api/bootstrap/x64"
+        />
+        <Copy
+            SourceFiles="$(PkgMicrosoft_WindowsAppSDK)\lib\win10-x86\Microsoft.WindowsAppRuntime.Bootstrap.lib"
+            DestinationFolder="../crates/targets/i686_msvc/lib"
+        />
+        <Copy
+            SourceFiles="$(PkgMicrosoft_WindowsAppSDK)\runtimes\win10-x86\native\Microsoft.WindowsAppRuntime.Bootstrap.dll"
+            DestinationFolder="../crates/tools/api/bootstrap/x86"
+        />
+    </Target>
+
     <ItemGroup>
         <MuxHeaders Include="$(PkgMicrosoft_WindowsAppSDK)\include\microsoft.ui.xaml.*.h" />
         <MuxHostingHeaders Include="$(PkgMicrosoft_WindowsAppSDK)\include\microsoft.ui.xaml.hosting.*.h" />
@@ -40,7 +67,7 @@
             <Namespace>Microsoft.WindowsAppSdk.Foundation</Namespace>
         </Partition>
 
-        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" GeneratePathProperty="true">
+        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" GeneratePathProperty="true">
             <IncludeAssets>none</IncludeAssets>
         </PackageReference>
 

.metadata/global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "5.0.0",
+    "rollForward": "latestMinor",
+    "allowPrerelease": false
+  }
+}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windows-app"
-version = "0.3.0"
+version = "0.4.0"
 authors = [""]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -18,20 +18,20 @@ members = [
 ]
 
 [target.i686-pc-windows-msvc.dependencies]
-windows_app_i686_msvc = { path = "crates/targets/i686_msvc", version = "0.3.0" }
+windows_app_i686_msvc = { path = "crates/targets/i686_msvc", version = "0.4.0" }
 
 [target.x86_64-pc-windows-msvc.dependencies]
-windows_app_x86_64_msvc = { path = "crates/targets/x86_64_msvc", version = "0.3.0" }
+windows_app_x86_64_msvc = { path = "crates/targets/x86_64_msvc", version = "0.4.0" }
 
 [target.aarch64-pc-windows-msvc.dependencies]
-windows_app_aarch64_msvc = { path = "crates/targets/aarch64_msvc", version = "0.3.0" }
+windows_app_aarch64_msvc = { path = "crates/targets/aarch64_msvc", version = "0.4.0" }
 
 [package.metadata.docs.rs]
 default-target = "x86_64-pc-windows-msvc"
 targets = []
 
 [dependencies.windows]
-version = "0.34.0"
+version = "0.35.0"
 features = [
     "alloc",
     "Foundation_Collections",
@@ -44,53 +44,54 @@ features = [
 [features]
 default = []
 deprecated = []
+implement = ["windows/implement"]
 Foundation = []
 Graphics = []
 Graphics_DirectX = ["Graphics"]
 MRM = []
 UI = ["windows/UI"]
-UI_Composition = ["UI","windows/UI","windows/Graphics_Effects","windows/Foundation","windows/Foundation_Numerics","windows/Graphics","windows/Foundation_Collections"]
+UI_Composition = ["UI","windows/Graphics","windows/UI","windows/Foundation","windows/Foundation_Numerics","windows/Foundation_Collections","windows/Graphics_Effects"]
 UI_Composition_Core = ["UI_Composition","windows/Foundation"]
 UI_Composition_Diagnostics = ["UI_Composition"]
 UI_Composition_Effects = ["UI_Composition","windows/Graphics_Effects"]
 UI_Composition_Interactions = ["UI_Composition","windows/Foundation","windows/Foundation_Numerics","windows/Foundation_Collections"]
-UI_Composition_Scenes = ["UI_Composition","windows/Foundation_Numerics","windows/Foundation","windows/Foundation_Collections"]
-UI_Composition_SystemBackdrops = ["UI_Composition","windows/UI_Composition","windows/UI","windows/UI_Core"]
+UI_Composition_Scenes = ["UI_Composition","windows/Foundation_Numerics","windows/Foundation_Collections","windows/Foundation"]
+UI_Composition_SystemBackdrops = ["UI_Composition","windows/UI_Composition","windows/UI_Core","windows/UI"]
 UI_Dispatching = ["UI","windows/Foundation"]
-UI_Input = ["UI","windows/Foundation_Collections","windows/UI_Core","windows/System","windows/Foundation"]
+UI_Input = ["UI","windows/System","windows/Foundation_Collections","windows/Foundation","windows/UI_Core"]
 UI_Input_Interop = ["UI_Input","windows/Devices_Input"]
-UI_Text = ["UI","windows/UI_Text","windows/Foundation","windows/Storage_Streams","windows/UI"]
+UI_Text = ["UI","windows/UI","windows/Foundation","windows/Storage_Streams","windows/UI_Text"]
 UI_Windowing = ["UI","windows/Foundation","windows/Graphics","windows/UI","windows/Foundation_Collections"]
-UI_Xaml = ["UI","windows/Win32_Foundation","windows/Foundation_Collections","windows/UI_Core","windows/UI_Xaml_Interop","windows/ApplicationModel_Core","windows/Foundation_Numerics","windows/UI","windows/ApplicationModel_DataTransfer_DragDrop","windows/Graphics_Imaging","windows/Foundation","windows/ApplicationModel","windows/ApplicationModel_Activation","windows/ApplicationModel_DataTransfer"]
+UI_Xaml = ["UI","windows/Win32_Foundation","windows/Foundation","windows/ApplicationModel_Activation","windows/Foundation_Numerics","windows/ApplicationModel_Core","windows/ApplicationModel_DataTransfer_DragDrop","windows/UI_Core","windows/ApplicationModel","windows/ApplicationModel_DataTransfer","windows/Graphics_Imaging","windows/Foundation_Collections","windows/UI_Xaml_Interop","windows/UI"]
 UI_Xaml_Automation = ["UI_Xaml","windows/Foundation_Collections"]
 UI_Xaml_Automation_Peers = ["UI_Xaml_Automation","windows/Foundation","windows/Foundation_Collections"]
-UI_Xaml_Automation_Provider = ["UI_Xaml_Automation","windows/Foundation","windows/UI"]
+UI_Xaml_Automation_Provider = ["UI_Xaml_Automation","windows/UI","windows/Foundation"]
 UI_Xaml_Automation_Text = ["UI_Xaml_Automation"]
-UI_Xaml_Controls = ["UI_Xaml","windows/Foundation","windows/Foundation_Collections","windows/Foundation_Numerics","windows/UI_Text","windows/ApplicationModel_DataTransfer","windows/Globalization","windows/Media_Casting","windows/UI","windows/UI_Xaml_Interop","windows/Globalization_NumberFormatting","windows/ApplicationModel_Contacts"]
-UI_Xaml_Controls_AnimatedVisuals = ["UI_Xaml_Controls","windows/Foundation_Collections","windows/UI"]
-UI_Xaml_Controls_Primitives = ["UI_Xaml_Controls","windows/Foundation","windows/Foundation_Collections","windows/UI","windows/Foundation_Numerics","windows/UI_Xaml_Interop"]
+UI_Xaml_Controls = ["UI_Xaml","windows/ApplicationModel_DataTransfer","windows/ApplicationModel_Contacts","windows/Foundation","windows/Foundation_Collections","windows/UI_Xaml_Interop","windows/Globalization","windows/Globalization_NumberFormatting","windows/UI_Text","windows/UI","windows/Foundation_Numerics","windows/Media_Casting"]
+UI_Xaml_Controls_AnimatedVisuals = ["UI_Xaml_Controls","windows/UI","windows/Foundation_Collections"]
+UI_Xaml_Controls_Primitives = ["UI_Xaml_Controls","windows/UI","windows/Foundation_Numerics","windows/Foundation","windows/UI_Xaml_Interop","windows/Foundation_Collections"]
 UI_Xaml_Core = ["UI_Xaml"]
 UI_Xaml_Core_Direct = ["UI_Xaml_Core"]
 UI_Xaml_Data = ["UI_Xaml","windows/Foundation","windows/UI_Xaml_Interop","windows/Foundation_Collections"]
-UI_Xaml_Documents = ["UI_Xaml","windows/Foundation_Collections","windows/Foundation","windows/UI_Text"]
-UI_Xaml_Hosting = ["UI_Xaml","windows/Win32_UI_WindowsAndMessaging","windows/Win32_Foundation"]
-UI_Xaml_Input = ["UI_Xaml","windows/System","windows/Foundation","windows/Foundation_Collections","windows/UI_Core"]
+UI_Xaml_Documents = ["UI_Xaml","windows/Foundation","windows/UI_Text","windows/Foundation_Collections"]
+UI_Xaml_Hosting = ["UI_Xaml","windows/Win32_Foundation","windows/Win32_UI_WindowsAndMessaging"]
+UI_Xaml_Input = ["UI_Xaml","windows/System","windows/UI_Core","windows/Foundation","windows/Foundation_Collections"]
 UI_Xaml_Interop = ["UI_Xaml","windows/Foundation"]
-UI_Xaml_Markup = ["UI_Xaml","windows/UI_Xaml_Interop","windows/Foundation_Collections","windows/Foundation","windows/Storage_Streams"]
-UI_Xaml_Media = ["UI_Xaml","windows/Win32_Foundation","windows/Storage_Streams","windows/UI","windows/Foundation","windows/Win32_Graphics_Dxgi","windows/Foundation_Collections"]
-UI_Xaml_Media_Animation = ["UI_Xaml_Media","windows/UI","windows/Foundation","windows/Foundation_Collections"]
-UI_Xaml_Media_Imaging = ["UI_Xaml_Media","windows/Foundation","windows/Storage_Streams","windows/ApplicationModel_Background","windows/Graphics_Imaging"]
+UI_Xaml_Markup = ["UI_Xaml","windows/Foundation_Collections","windows/UI_Xaml_Interop","windows/Foundation","windows/Storage_Streams"]
+UI_Xaml_Media = ["UI_Xaml","windows/Foundation_Collections","windows/UI","windows/Foundation","windows/Win32_Graphics_Dxgi","windows/Win32_Foundation","windows/Storage_Streams"]
+UI_Xaml_Media_Animation = ["UI_Xaml_Media","windows/Foundation_Collections","windows/UI","windows/Foundation"]
+UI_Xaml_Media_Imaging = ["UI_Xaml_Media","windows/Graphics_Imaging","windows/Foundation","windows/Storage_Streams","windows/ApplicationModel_Background"]
 UI_Xaml_Media_Media3D = ["UI_Xaml_Media"]
-UI_Xaml_Navigation = ["UI_Xaml","windows/Foundation","windows/UI_Xaml_Interop"]
+UI_Xaml_Navigation = ["UI_Xaml","windows/UI_Xaml_Interop","windows/Foundation"]
 UI_Xaml_Printing = ["UI_Xaml","windows/Graphics_Printing","windows/Foundation"]
 UI_Xaml_Resources = ["UI_Xaml"]
 UI_Xaml_Shapes = ["UI_Xaml","windows/Foundation_Collections"]
 UI_Xaml_XamlTypeInfo = ["UI_Xaml","windows/UI_Xaml_Interop"]
 Web = []
 Web_WebView2 = ["Web"]
-Web_WebView2_Core = ["Web_WebView2","windows/Foundation","windows/Foundation_Collections","windows/Storage_Streams","windows/UI","windows/Security_Cryptography_Certificates","windows/UI_Core"]
+Web_WebView2_Core = ["Web_WebView2","windows/Security_Cryptography_Certificates","windows/Storage_Streams","windows/Foundation","windows/Foundation_Collections","windows/UI_Core","windows/UI"]
 Windows = []
-Windows_AppLifecycle = ["Windows","windows/Foundation_Collections","windows/Foundation"]
+Windows_AppLifecycle = ["Windows","windows/Foundation","windows/Foundation_Collections"]
 Windows_ApplicationModel = ["Windows"]
 Windows_ApplicationModel_DynamicDependency = ["Windows_ApplicationModel","windows/ApplicationModel"]
 Windows_ApplicationModel_Resources = ["Windows_ApplicationModel","windows/Foundation_Collections","windows/Foundation"]

crates/samples/appwindow/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "samples_appwindow"
+name = "sample_appwindow"
 version = "0.0.0"
 publish = false
 edition = "2018"
@@ -11,7 +11,7 @@ features = [
 ]
 
 [dependencies.windows]
-version = "0.34.0"
+version = "0.35.0"
 features = [ "Win32_UI_HiDpi" ]
 
 [dependencies.windows-app]

crates/samples/battery/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "samples_battery"
+name = "sample_battery"
 version = "0.0.0"
 publish = false
 edition = "2018"
@@ -11,7 +11,7 @@ features = [
 ]
 
 [dependencies.windows]
-version = "0.34.0"
+version = "0.35.0"
 
 [dependencies.windows-app]
 path = "../../../"

crates/samples/colors/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "samples_colors"
+name = "sample_colors"
 version = "0.0.0"
 publish = false
 edition = "2018"
@@ -11,7 +11,7 @@ features = [
 ]
 
 [dependencies.windows]
-version = "0.34.0"
+version = "0.35.0"
 
 [dependencies.windows-app]
 path = "../../../"

crates/samples/mrm/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "samples_mrm"
+name = "sample_mrm"
 version = "0.0.0"
 publish = false
 edition = "2018"
@@ -11,7 +11,7 @@ features = [
 ]
 
 [dependencies.windows]
-version = "0.34.0"
+version = "0.35.0"
 
 [dependencies.windows-app]
 path = "../../../"

crates/samples/xamlapp/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "sample_xamlapp"
+version = "0.0.0"
+publish = false
+edition = "2018"
+
+[build-dependencies.windows-app]
+path = "../../../"
+features = [
+    "WindowsAppSdk_Foundation"
+]
+
+[dependencies.windows]
+version = "0.35.0"
+features = [
+    "alloc",
+    "implement",
+    "Win32_UI_HiDpi",
+]
+
+[dependencies.windows-app]
+path = "../../../"
+features = [
+    "implement",
+    "WindowsAppSdk_Foundation",
+    "UI_Xaml_Controls_Primitives",
+]

crates/samples/xamlapp/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    ::windows_app::bootstrap::deploy::to_output_dir();
+}