diff --git a/Win2D.proj b/Win2D.proj index 6f1cb2962..41b5f3353 100644 --- a/Win2D.proj +++ b/Win2D.proj @@ -99,54 +99,21 @@ - - - - - - - - - - - - - - - - - - + + + Properties="IncludeVersionInfo=true" /> @@ -332,7 +299,7 @@ %(BuildConfiguration.Identity) - + %(BuildPlatform.Identity) diff --git a/build/Assets/Logo.scale-200.png b/build/Assets/Logo.scale-200.png new file mode 100644 index 000000000..076b3a389 Binary files /dev/null and b/build/Assets/Logo.scale-200.png differ diff --git a/build/Assets/SmallLogo.scale-200.png b/build/Assets/SmallLogo.scale-200.png new file mode 100644 index 000000000..fe2cf3f5a Binary files /dev/null and b/build/Assets/SmallLogo.scale-200.png differ diff --git a/build/Assets/SplashScreen.scale-200.png b/build/Assets/SplashScreen.scale-200.png new file mode 100644 index 000000000..d6f68949e Binary files /dev/null and b/build/Assets/SplashScreen.scale-200.png differ diff --git a/build/Assets/StoreLogo.scale-200.png b/build/Assets/StoreLogo.scale-200.png new file mode 100644 index 000000000..95c982750 Binary files /dev/null and b/build/Assets/StoreLogo.scale-200.png differ diff --git a/build/Win2D.cpp.props b/build/Win2D.cpp.props index 8b371d6a2..f0b1a5318 100644 --- a/build/Win2D.cpp.props +++ b/build/Win2D.cpp.props @@ -54,13 +54,7 @@ 10.0.19041.0 - - - 10.0.10240.0 - 10.0.10240.0 - - - 10.0.16299.0 + 10.0.16299.0 diff --git a/build/Win2D.cs.props b/build/Win2D.cs.props index 9016091c0..8f1452a8a 100644 --- a/build/Win2D.cs.props +++ b/build/Win2D.cs.props @@ -17,11 +17,6 @@ 4 true 10.0.19041.0 - - - 10.0.10240.0 - - 10.0.16299.0 diff --git a/build/nuget-restore.targets b/build/nuget-restore.targets index 7635ac45d..f76592693 100644 --- a/build/nuget-restore.targets +++ b/build/nuget-restore.targets @@ -51,11 +51,7 @@ - - - - - - + + diff --git a/nuget.config b/nuget.config index aa5e9f4cc..200b6a0ad 100644 --- a/nuget.config +++ b/nuget.config @@ -1,8 +1,6 @@ - - diff --git a/release-nuget.config b/release-nuget.config index 59f2bbfdb..200b6a0ad 100644 --- a/release-nuget.config +++ b/release-nuget.config @@ -1,8 +1,6 @@ - - diff --git a/samples/CompositionExample/CompositionExample.csproj b/samples/CompositionExample/CompositionExample.csproj index faae767ae..05c55be70 100644 --- a/samples/CompositionExample/CompositionExample.csproj +++ b/samples/CompositionExample/CompositionExample.csproj @@ -112,7 +112,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/CompositionExample/Package.appxmanifest b/samples/CompositionExample/Package.appxmanifest index 7e995ce5d..79c321f96 100644 --- a/samples/CompositionExample/Package.appxmanifest +++ b/samples/CompositionExample/Package.appxmanifest @@ -1,6 +1,6 @@ - + Win2D Composition Example diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest index fdeee44b3..fd8420fab 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest +++ b/samples/CoreWindowExample/CoreWindowExample.uap.appxmanifest @@ -4,7 +4,7 @@ xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> - + Win2D CoreWindow Example diff --git a/samples/CoreWindowExample/CoreWindowExample.uap.csproj b/samples/CoreWindowExample/CoreWindowExample.uap.csproj index 8d8472e75..fbc44f0b8 100644 --- a/samples/CoreWindowExample/CoreWindowExample.uap.csproj +++ b/samples/CoreWindowExample/CoreWindowExample.uap.csproj @@ -112,7 +112,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj b/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj index 5e4428ee2..ed25241a8 100644 --- a/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj +++ b/samples/ExampleGallery/BackgroundTask/ExampleGallery.BackgroundTask.uap.csproj @@ -110,7 +110,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj b/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj index 9a97f5889..abf814fc7 100644 --- a/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj +++ b/samples/ExampleGallery/Direct3DInterop/ExampleGallery.Direct3DInterop.uap.vcxproj @@ -1,6 +1,6 @@  - + @@ -46,15 +46,15 @@ - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/samples/ExampleGallery/Direct3DInterop/packages.config b/samples/ExampleGallery/Direct3DInterop/packages.config index e39c18ce5..7be7b7792 100644 --- a/samples/ExampleGallery/Direct3DInterop/packages.config +++ b/samples/ExampleGallery/Direct3DInterop/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj b/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj index 3aa8411b1..e41df9f3a 100644 --- a/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj +++ b/samples/ExampleGallery/Effects/ExampleGallery.Effects.csproj @@ -109,7 +109,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest index 2428606cc..040c4c04b 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.appxmanifest +++ b/samples/ExampleGallery/ExampleGallery.uap.appxmanifest @@ -4,7 +4,7 @@ xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> - + Win2D Example Gallery diff --git a/samples/ExampleGallery/ExampleGallery.uap.csproj b/samples/ExampleGallery/ExampleGallery.uap.csproj index c65aeacec..8ca93f88c 100644 --- a/samples/ExampleGallery/ExampleGallery.uap.csproj +++ b/samples/ExampleGallery/ExampleGallery.uap.csproj @@ -127,7 +127,7 @@ - 6.2.9 + 6.2.14 diff --git a/samples/SimpleSample/SimpleSample.uap.appxmanifest b/samples/SimpleSample/SimpleSample.uap.appxmanifest index 9fc67a86f..646bdaf21 100644 --- a/samples/SimpleSample/SimpleSample.uap.appxmanifest +++ b/samples/SimpleSample/SimpleSample.uap.appxmanifest @@ -7,7 +7,7 @@ diff --git a/samples/SimpleSample/SimpleSample.uap.csproj b/samples/SimpleSample/SimpleSample.uap.csproj index f1477f658..01df2002d 100644 --- a/samples/SimpleSample/SimpleSample.uap.csproj +++ b/samples/SimpleSample/SimpleSample.uap.csproj @@ -146,7 +146,7 @@ - 6.2.9 + 6.2.14 diff --git a/tools/docs/BuildDocs.proj b/tools/docs/BuildDocs.proj index 2b0b874b7..9adf42077 100644 --- a/tools/docs/BuildDocs.proj +++ b/tools/docs/BuildDocs.proj @@ -62,7 +62,7 @@ - + $(MSBuildThisFileDirectory)..\..\packages\System.Runtime.4.0.20\ref\dotnet @@ -126,7 +126,7 @@ - + diff --git a/winrt/projection/winrt.projection.csproj b/winrt/projection/winrt.projection.csproj index 969606d5a..503a0b895 100644 --- a/winrt/projection/winrt.projection.csproj +++ b/winrt/projection/winrt.projection.csproj @@ -52,7 +52,7 @@ - 10.0.$([System.Version]::Parse('$(TargetPlatformVersion)').Build).54 + 10.0.$([System.Version]::Parse('$(TargetPlatformVersion)').Build).57 Microsoft.Graphics.Canvas; @@ -68,7 +68,6 @@ - - + diff --git a/winrt/test.external/winrt.test.external.uap.appxmanifest b/winrt/test.external/winrt.test.external.uap.appxmanifest index c28de4983..2b6276eec 100644 --- a/winrt/test.external/winrt.test.external.uap.appxmanifest +++ b/winrt/test.external/winrt.test.external.uap.appxmanifest @@ -6,7 +6,7 @@ IgnorableNamespaces="uap mp"> diff --git a/winrt/test.managed/winrt.test.managed.uap.appxmanifest b/winrt/test.managed/winrt.test.managed.uap.appxmanifest index 9f862bf29..cda59c799 100644 --- a/winrt/test.managed/winrt.test.managed.uap.appxmanifest +++ b/winrt/test.managed/winrt.test.managed.uap.appxmanifest @@ -5,7 +5,7 @@ xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> diff --git a/winrt/test.managed/winrt.test.managed.uap.csproj b/winrt/test.managed/winrt.test.managed.uap.csproj index 16ccc4978..85387f717 100644 --- a/winrt/test.managed/winrt.test.managed.uap.csproj +++ b/winrt/test.managed/winrt.test.managed.uap.csproj @@ -14,11 +14,12 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 16.0 + 17.0 true true true true + Never @@ -95,6 +96,18 @@ + + Assets\Logo.scale-200.png + + + Assets\SmallLogo.scale-200.png + + + Assets\SplashScreen.scale-200.png + + + Assets\StoreLogo.scale-200.png + Assets\Logo.scale-240.png @@ -152,16 +165,16 @@ - 16.2.0 + 17.3.3 - 6.2.9 + 6.2.14 - 2.0.0 + 3.7.0 - 2.0.0 + 3.7.0