Merged PR 248033: Merge pfelts/VeniceEventFixes to future

Added new samples for the Creators Update.
2017-02-08 21:19:27 +00:00 · 2017-02-08 21:19:27 +00:00 · ba688a6517
--- a/SampleGallery/MainPage.xaml.cs
+++ b/SampleGallery/MainPage.xaml.cs
@ -18,6 +18,7 @@ using System.Numerics;
 using Windows.Foundation;
 using Windows.UI;
 using Windows.UI.Composition;
+using Windows.UI.Popups;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Hosting;
--- a/SampleGallery/SampleGallery.csproj
+++ b/SampleGallery/SampleGallery.csproj
@ -15,7 +15,7 @@
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <PackageCertificateKeyFile>CompositionSampleGallery_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.15021.0</TargetPlatformVersion>
    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
  </PropertyGroup>
  <Import Project="$(MSBuildThisFileDirectory)\..\SamplesCommon\SamplesCommon\CommonBuild.props" />
@ -142,11 +142,11 @@
    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridResizing.xaml.cs" Condition="$(TargetPlatformBuild) &gt;10586">
      <DependentUpon>NineGridResizing.xaml</DependentUpon>
    </Compile>
-    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\BorderNineGridScenario.cs" />
-    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\ColorNineGridScenario.cs" />
-    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\EffectNineGridScenario.cs" />
-    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\MaskNineGridScenario.cs" />
-    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\SurfaceNineGridScenario.cs" />
+    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\BorderNineGridScenario.cs" Condition="$(TargetPlatformBuild) &gt;10586" />
+    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\ColorNineGridScenario.cs" Condition="$(TargetPlatformBuild) &gt;10586" />
+    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\EffectNineGridScenario.cs" Condition="$(TargetPlatformBuild) &gt;10586" />
+    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\MaskNineGridScenario.cs" Condition="$(TargetPlatformBuild) &gt;10586" />
+    <Compile Include="Samples\SDK 14393\NineGridResizing\NineGridScenarios\SurfaceNineGridScenario.cs" Condition="$(TargetPlatformBuild) &gt;10586" />
    <Compile Include="Samples\SDK 14393\PullToAnimate\PullToAnimate.cs" Condition="$(TargetPlatformBuild) &gt;10586" />
    <Compile Include="Samples\SDK 14393\ShadowsAdvanced\ShadowsAdvanced.cs" Condition="$(TargetPlatformBuild) &gt;10586" />
    <Compile Include="Samples\SDK 14393\ShadowInterop\ShadowInterop.cs" Condition="$(TargetPlatformBuild) &gt;10586" />
--- a/Insider/BorderPlayground/BorderPlayground.xaml.cs
+++ b/Insider/BorderPlayground/BorderPlayground.xaml.cs
@ -2,7 +2,7 @@
 //
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
 // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
 // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
--- a/Insider/CompCapabilities/CompCapabilities.xaml.cs
+++ b/Insider/CompCapabilities/CompCapabilities.xaml.cs
@ -2,7 +2,7 @@
 //
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
 // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
 // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
--- a/Insider/NavigationFlow/NavigationFlow.xaml.cs
+++ b/Insider/NavigationFlow/NavigationFlow.xaml.cs
@ -1,4 +1,18 @@
-using System;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
--- a/Insider/NavigationFlow/NavigationFlowDestinationPage.xaml.cs
+++ b/Insider/NavigationFlow/NavigationFlowDestinationPage.xaml.cs
@ -1,4 +1,18 @@
-using System;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using System;
 using Windows.UI.Composition;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Hosting;
@ -27,6 +41,8 @@ namespace CompositionSampleGallery
            topBorderOffsetAnimation.InsertKeyFrame(1, 0);

            ElementCompositionPreview.SetIsTranslationEnabled(TopBorder, true);
+            // Call GetElementVisual() to work around a bug in Insider Build 15025
+            ElementCompositionPreview.GetElementVisual(TopBorder);
            ElementCompositionPreview.SetImplicitShowAnimation(TopBorder, topBorderOffsetAnimation);

            // Add an opacity and translation animation that will play when this element is shown
@ -50,6 +66,7 @@ namespace CompositionSampleGallery
            mainContentShowAnimations.Add(mainContentOpacityAnimation);

            ElementCompositionPreview.SetIsTranslationEnabled(MainContent, true);
+            ElementCompositionPreview.GetElementVisual(MainContent);
            ElementCompositionPreview.SetImplicitShowAnimation(MainContent, mainContentShowAnimations);

            // Add a translation animation that will play when this element exits the scene
@ -68,6 +85,7 @@ namespace CompositionSampleGallery
            topBorderExitAnimation.Duration = TimeSpan.FromSeconds(0.4);

            ElementCompositionPreview.SetIsTranslationEnabled(TopBorder, true);
+            ElementCompositionPreview.GetElementVisual(TopBorder);
            ElementCompositionPreview.SetImplicitHideAnimation(TopBorder, topBorderExitAnimation);

            // Add an opacity animation that will play when the page exits the scene
@ -78,6 +96,7 @@ namespace CompositionSampleGallery

            // Set Z index to force this page to the top during the hide animation
            Canvas.SetZIndex(this, 1);
+            ElementCompositionPreview.GetElementVisual(this);
            ElementCompositionPreview.SetImplicitHideAnimation(this, fadeOut);
        }

--- a/Insider/NavigationFlow/NavigationFlowSourcePage.xaml.cs
+++ b/Insider/NavigationFlow/NavigationFlowSourcePage.xaml.cs
@ -1,4 +1,18 @@
-using System;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH 
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using System;
 using System.Collections.Generic;
 using Windows.UI.Composition;
 using Windows.UI.Xaml.Controls;
@ -34,6 +48,8 @@ namespace CompositionSampleGallery
            fadeInAnimation.InsertKeyFrame(0, 0);
            fadeInAnimation.InsertKeyFrame(1, 1);

+            // Call GetElementVisual() to work around a bug in Insider Build 15025
+            ElementCompositionPreview.GetElementVisual(this);
            ElementCompositionPreview.SetImplicitShowAnimation(this, fadeInAnimation);

            // Set a fade out animation when this page exits the scene
--- a/SampleGallery/Samples/SampleTemplate/SampleTemplate.xaml.cs
+++ b/SampleGallery/Samples/SampleTemplate/SampleTemplate.xaml.cs
@ -2,7 +2,7 @@
 //
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
 // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
 // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
--- a/SampleGallery/Shared/SampleDefinition.cs
+++ b/SampleGallery/Shared/SampleDefinition.cs
@ -2,7 +2,7 @@
 //
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
-// THE SOFTWARE IS PROVIDED <EFBFBD>AS IS<49>, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
 // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
 // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
@ -80,10 +80,10 @@ namespace CompositionSampleGallery
        static SampleDefinition[] definitions =
        {
 #if SDKVERSION_INSIDER
-            new SampleDefinition(BorderPlayground.StaticSampleName,             typeof(BorderPlayground),               SampleType.Reference, SampleCategory.Effects),
-            new SampleDefinition(CompCapabilities.StaticSampleName,             typeof(CompCapabilities),               SampleType.Reference, SampleCategory.Effects),
-            new SampleDefinition(TransparentWindow.StaticSampleName,            typeof(TransparentWindow),              SampleType.EndToEnd,  SampleCategory.Effects),
-            new SampleDefinition(NavigationFlow.StaticSampleName,               typeof(NavigationFlow),                 SampleType.EndToEnd,  SampleCategory.Transitions),
+            new SampleDefinition(BorderPlayground.StaticSampleName,             typeof(BorderPlayground),               SampleType.Reference, SampleCategory.Effects, false, true),
+            new SampleDefinition(CompCapabilities.StaticSampleName,             typeof(CompCapabilities),               SampleType.Reference, SampleCategory.Effects, false, false),
+            new SampleDefinition(TransparentWindow.StaticSampleName,            typeof(TransparentWindow),              SampleType.EndToEnd,  SampleCategory.Effects, true, true),
+            new SampleDefinition(NavigationFlow.StaticSampleName,               typeof(NavigationFlow),                 SampleType.EndToEnd,  SampleCategory.Transitions, false, false),
 #endif

 #if SDKVERSION_14393