Skip to content

Commit

Permalink
Update Min OS Version for MUX to RS2 (#977)
Browse files Browse the repository at this point in the history
  • Loading branch information
kmahone authored Jul 1, 2019
1 parent 1c4cbef commit 3b631bd
Show file tree
Hide file tree
Showing 29 changed files with 30 additions and 132 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ NuGet package version:
| April 2018 Update (17134) | <!-- Yes/No? --> |
| Fall Creators Update (16299) | <!-- Yes/No? --> |
| Creators Update (15063) | <!-- Yes/No? --> |
| Anniversary Update (14393) | <!-- Yes/No? --> |

<!-- Which device form factors did you see the issue on? Leave blank if you didn't try that device. -->
| Device form factor | Saw the problem? |
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ You don't need version checks or conditional XAML markup to use WinUI controls o

### Version support

The Microsoft.UI.Xaml 2.2 NuGet package requires your project to have TargetPlatformVersion &gt;= 10.0.18362.0 and TargetPlatformMinVersion &gt;= 10.0.14393.0 when building.
The Microsoft.UI.Xaml 2.2 NuGet package requires your project to have TargetPlatformVersion &gt;= 10.0.18362.0 and TargetPlatformMinVersion &gt;= 10.0.15063.0 when building.

Your app's users can be on any of the following supported Windows versions:
* Windows Insider Previews
Expand All @@ -70,7 +70,6 @@ Your app's users can be on any of the following supported Windows versions:
* April 2018 Update (17134 aka "Redstone 4")
* Fall Creators Update (16299 aka "Redstone 3")
* Creators Update (15063 aka "Redstone 2")
* Anniversary Update (14393 aka "Redstone 1")

Some features may have a reduced or slightly different user experience on older versions, particularly on builds before 15063. This should not impact overall usability.

Expand Down
4 changes: 2 additions & 2 deletions build/FrameworkPackage/FrameworkPackage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Resource Language="en-US" />
</Resources>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.14393.0" MaxVersionTested="10.0.17706.0" />
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15063.0" MaxVersionTested="10.0.18362.0" />
</Dependencies>
<mp:PhoneIdentity PhoneProductId="3F0E3E5D-C663-407a-9187-9A5F47398F11" PhonePublisherId="1AC97219-40D1-4c98-B175-2BFCD96578C3" />
<Extensions>
Expand Down
15 changes: 0 additions & 15 deletions build/FrameworkPackage/MakeFrameworkPackage.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -220,21 +220,6 @@ if ($Configuration -ilike "debug")
#$PackageName += ".Debug"
}

# On RS1 we do not have support for DefaultStyleResourceUri which enables our controls to point the XAML framework to load
# their default style out of the framework package's versioned generic.xaml. The support exists on RS2 and greater so for
# RS1 we include a generic.xaml in the default app location that the framework looks for component styles and have that
# file just be a pointer to the framework package rs1 generic.xaml.
$rs1_genericxaml =
@"
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="ms-appx://$PackageName/Microsoft.UI.Xaml/Themes/generic.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
"@

Set-Content -Value $rs1_genericxaml $fullOutputPath\rs1_themes_generic.xaml

# Allow single URI to access Compact.xaml from both framework package and nuget package
$compactxaml =
@"
Expand Down
4 changes: 2 additions & 2 deletions build/NuSpecs/MUXControls-Nuget-Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<MicrosoftUIXamlTargetPlatformMinCheckValue>$([System.Version]::Parse('$(TargetPlatformMinVersion)').Build)</MicrosoftUIXamlTargetPlatformMinCheckValue>
</PropertyGroup>
<Error
Text="Microsoft.UI.Xaml nuget package requires TargetPlatformMinVersion &gt;= 10.0.14393.0 (current project is $(MicrosoftUIXamlTargetPlatformMinCheckValue))"
Condition="$(MicrosoftUIXamlTargetPlatformMinCheckValue) &lt; 14393" />
Text="Microsoft.UI.Xaml nuget package requires TargetPlatformMinVersion &gt;= 10.0.15063.0 (current project is $(MicrosoftUIXamlTargetPlatformMinCheckValue))"
Condition="$(MicrosoftUIXamlTargetPlatformMinCheckValue) &lt; 15063" />
<PropertyGroup>
<MicrosoftUIXamlTargetPlatformCheckValue>$([System.Version]::Parse('$(TargetPlatformVersion)').Build)</MicrosoftUIXamlTargetPlatformCheckValue>
</PropertyGroup>
Expand Down
8 changes: 0 additions & 8 deletions build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,6 @@
<PackagingOutputs Remove="@(XamlCompactXbfPackagingOutputToBeRemoved)" />
</ItemGroup>
</Target>

<!-- Workaround for apps that need RS1 support, include this only if min version is RS1 -->
<ItemGroup Condition="($([System.Version]::Parse('$(TargetPlatformMinVersion)').Build) &lt; 15063) And '$(DisableMicrosoftUIXamlRS1ThemesWorkaround)'==''">
<Page Include="$(MSBuildThisFileDirectory)rs1_themes\generic.xaml">
<SubType>Designer</SubType>
<Link>Microsoft.UI.Xaml\Themes\generic.xaml</Link>
</Page>
</ItemGroup>

<!-- Make this URI works in framework package "ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" -->
<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion build/NuSpecs/MUXControlsFrameworkPackage.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<file target="build\Common.targets" src="MUXControls-Nuget-Common.targets"/>
<file target="build\$ID$.props" src="MUXControls-Nuget-FrameworkPackage.props"/>
<file target="build\native\$ID$.targets" src="MUXControls-Nuget-FrameworkPackage.targets"/>
<file target="build\rs1_themes\generic.xaml" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\FrameworkPackage\rs1_themes_generic.xaml"/>
<file target="build\DensityStyles\Compact.xaml" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\FrameworkPackage\Compact.xaml"/>
</files>
</package>
19 changes: 2 additions & 17 deletions dev/dll/Microsoft.UI.Xaml.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">$(MuxSdkVersion)</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<!-- Use 64-bit compilers because 32-bit compilers run out of heap space -->
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
Expand Down Expand Up @@ -290,11 +290,6 @@
<ResourceCompile Include="Microsoft.UI.Xaml.rc" />
</ItemGroup>
<ItemGroup>
<Page Include="$(OutDir)Generic.xaml">
<SubType>Designer</SubType>
<ThemeResource>true</ThemeResource>
<Link>Themes\%(Filename)%(Extension)</Link>
</Page>
<Page Include="$(MSBuildProjectDirectory)\DensityStyles\Compact.xaml">
<SubType>Designer</SubType>
<ThemeResource>true</ThemeResource>
Expand All @@ -305,16 +300,6 @@
<ThemeResource>true</ThemeResource>
<Link>DensityStyles\%(Filename)%(Extension)</Link>
</Page>
<Page Include="$(OutDir)rs1_themeresources.xaml">
<SubType>Designer</SubType>
<ThemeResource>true</ThemeResource>
<Link>Themes\%(Filename)%(Extension)</Link>
</Page>
<Page Include="$(OutDir)rs1_compact_themeresources.xaml">
<SubType>Designer</SubType>
<ThemeResource>true</ThemeResource>
<Link>Themes\%(Filename)%(Extension)</Link>
</Page>
<!-- Pages which needs CustomCompile to run a different version of GenXBF, we attach MinSDKVersionRequired to Page to help CompileXaml to identify the min SDK Version -->
<PageRequiringCustomCompilation Include="$(OutDir)rs2_generic.xaml">
<SubType>Designer</SubType>
Expand Down Expand Up @@ -483,7 +468,7 @@
<Target Name="GenerateGenericResourceFile" DependsOnTargets="CategorizeSharedPages" BeforeTargets="$(GenerateXamlFileBeforeTargets)" Inputs="@(RS1StylePage);@(RS2StylePage);@(RS3StylePage);@(RS4StylePage);@(RS5StylePage);@(NineteenH1StylePage)" Outputs="$(OutDir)Generic.xaml;$(OutDir)rs1_generic.xaml;$(OutDir)rs2_generic.xaml;$(OutDir)rs3_generic.xaml;$(OutDir)rs4_generic.xaml;$(OutDir)rs5_generic.xaml;$(OutDir)19h1_generic.xaml;">
<Message Text="Generating generic resources XAML file " />
<BatchMergeXaml RS1Pages="@(RS1StylePage)" RS2Pages="@(RS2StylePage)" RS3Pages="@(RS3StylePage)" RS4Pages="@(RS4StylePage)" RS5Pages="@(RS5StylePage)" N19H1Pages="@(NineteenH1StylePage)" PostfixForGeneratedFile="generic" OutputDirectory="$(OutDir)" />
<Copy SourceFiles="$(OutDir)rs1_generic.xaml" DestinationFiles="$(OutDir)Generic.xaml" />
<Copy SourceFiles="$(OutDir)rs2_generic.xaml" DestinationFiles="$(OutDir)Generic.xaml" />
<!-- NB: We have to use CreateProperty here instead of PropertyGroup.
PropertyGroup values are always evaluated even when their enclosing target is skipped,
whereas CreateProperty has the TaskParameter ValueSetByTask that can be used
Expand Down
2 changes: 0 additions & 2 deletions dev/dll/Microsoft.UI.Xaml.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,10 @@
</ItemGroup>
<ItemGroup>
<Page Include="$(OutDir)Generic.xaml" />
<Page Include="$(OutDir)rs1_themeresources.xaml" />
<Page Include="@(PageRequiringCustomCompilation)" />
<Page Include="$(MSBuildProjectDirectory)\DensityStyles\Compact.xaml" />
<Page Include="$(MSBuildProjectDirectory)\DensityStyles\CompactDatePickerTimePickerFlyout.xaml" />
<Page Include="@(PageRequiringCustomCompilation)" />
<Page Include="$(OutDir)rs1_compact_themeresources.xaml" />
<Page Include="@(PageRequiringCustomCompilation)" />
</ItemGroup>
<ItemGroup>
Expand Down
54 changes: 5 additions & 49 deletions dev/dll/XamlControlsResources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ void XamlControlsResources::UpdateSource()
// is the best we can do without conditional markup.
winrt::Uri uri{
[useCompactResources]() -> hstring {
// Our RS2 styles depend on XamlCompositionBrushBase so use that as the condition here.
bool isRS2OrHigher = SharedHelpers::IsXamlCompositionBrushBaseAvailable();
// RS3 styles should be used on builds where ListViewItemPresenter's VSM integration works.
bool isRS3OrHigher = SharedHelpers::DoesListViewItemPresenterVSMWork();
bool isRS4OrHigher = SharedHelpers::IsRS4OrHigher();
Expand Down Expand Up @@ -75,13 +73,9 @@ void XamlControlsResources::UpdateSource()
{
releasePrefix = L"rs3_";
}
else if (isRS2OrHigher)
{
releasePrefix = L"rs2_";
}
else
{
releasePrefix = L"rs1_";
releasePrefix = L"rs2_";
}

return packagePrefix + releasePrefix + compactPrefix + postfix;
Expand All @@ -97,42 +91,13 @@ void XamlControlsResources::UpdateSource()

void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected, std::wstring_view const& className)
{
if (SharedHelpers::IsRS2OrHigher() || SharedHelpers::IsInDesignMode())
{
// On RS2 we set the DefaultStyleResourceUri so we don't need the complex DefaultStyleKey
// logic to hint XAML about the different generic.xaml location. We are telling them directly, so
// just have the DefaultStyleKey be the class name.
controlProtected.DefaultStyleKey(box_value(className));

controlProtected.DefaultStyleKey(box_value(className));
}
else
{
// On RS1 and earlier where we don't have DefaultStyleResourceUri we need to tell XAML where to look
// to load generic.xaml. By default it takes the DefaultStyleKey string (like Microsoft.UI.Xaml.Controls.Blah)
// and does ms-appx:///Microsoft.UI.Xaml.Controls/Themes/generic.xaml. This doesn't work for us
// because the PRI resource root is actually Microsoft.UI.Xaml. Luckily XAML has special logic if
// the DefaultStyleKey is an IReference<TypeName>. In this case, XAML will look up generic.xaml in a path
// constructed from the Assembly Name, and then we can have that be what we want (Microsoft.UI.Xaml).
// Also cache the style key that we make in a static because we don't want to build these two objects
// (hstring and IReference) every time we instance a control.

WCHAR szFullTypeName[256];
// Use the full type name discovered from what C# produces with typeof(X).FullName for Microsoft.UI.Xaml types.
StringCchPrintfW(szFullTypeName, _countof(szFullTypeName),
L"%s, " MUXCONTROLSROOT_NAMESPACE_STR ", Version = 255.255.255.255, Culture = neutral, PublicKeyToken = null, ContentType = WindowsRuntime",
className.data());

winrt::TypeName assemblyTypeName{ winrt::hstring(szFullTypeName), winrt::TypeKind::Metadata };
controlProtected.DefaultStyleKey(box_value(assemblyTypeName));
}

#ifndef BUILD_WINDOWS
if (auto control5 = controlProtected.try_as<winrt::IControl5>())
{
winrt::Uri uri{
[]() -> PCWSTR {
// Our RS2 styles depend on XamlCompositionBrushBase so use that as the condition here.
bool isRS2OrHigher = SharedHelpers::IsXamlCompositionBrushBaseAvailable();

// RS3 styles should be used on builds where ListViewItemPresenter's VSM integration works.
bool isRS3OrHigher = SharedHelpers::DoesListViewItemPresenterVSMWork();
bool isRS4OrHigher = SharedHelpers::IsRS4OrHigher();
Expand All @@ -158,13 +123,9 @@ void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected,
{
return L"ms-appx://" MUXCONTROLS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs3_generic.xaml";
}
else if (isRS2OrHigher)
{
return L"ms-appx://" MUXCONTROLS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_generic.xaml";
}
else
{
return L"ms-appx://" MUXCONTROLS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs1_generic.xaml";
return L"ms-appx://" MUXCONTROLS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_generic.xaml";
}
}
else
Expand All @@ -185,21 +146,16 @@ void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected,
{
return L"ms-appx:///" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs3_generic.xaml";
}
else if (isRS2OrHigher)
{
return L"ms-appx:///" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_generic.xaml";
}
else
{
return L"ms-appx:///" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs1_generic.xaml";
return L"ms-appx:///" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_generic.xaml";
}
}
}()
};
// Choose a default resource URI based on whether we're running in a framework package scenario or not.
control5.DefaultStyleResourceUri(uri);
}
#endif
}

// Normally global reveal lights are attached automtically via the first call to
Expand Down
2 changes: 1 addition & 1 deletion test/IXMPTestApp/IXMPTestApp.Shared.projitems
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down
2 changes: 1 addition & 1 deletion test/IXMPTestApp/MSTest/IXMPTestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>
<!-- We need to define NuGet references using this newer style for running tests locally in VS to work.
However, for some reason, specifially in lab builds, using the below to resolve NuGet references
causes it to complain that the uap10.0.14393 framework wasn't referenced.
causes it to complain that the uap10.0.15063 framework wasn't referenced.
As such, we'll use the more old-school package.json NuGet reference format for lab builds. -->
<PropertyGroup Condition="'$(XES_DFSDROP)' == ''">
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
Expand Down
2 changes: 1 addition & 1 deletion test/IXMPTestApp/MSTest/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"MSTest.TestFramework": "1.3.2"
},
"frameworks": {
"uap10.0.14393": {}
"uap10.0.15063": {}
},
"runtimes": {
"win10-x86": {},
Expand Down
2 changes: 1 addition & 1 deletion test/IXMPTestApp/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10586.0" MaxVersionTested="10.0.14393.0" />
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15063.0" MaxVersionTested="10.0.18362.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
Expand Down
2 changes: 1 addition & 1 deletion test/IXMPTestApp/TAEF/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"TAEF.Redist.Wlk": "10.31.180822002"
},
"frameworks": {
"uap10.0.14393": {}
"uap10.0.15063": {}
},
"runtimes": {
"win10-x86": {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<RootNamespace>MUXControls.ReleaseTest</RootNamespace>
<AssemblyName>MUXControls.ReleaseTest</AssemblyName>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(ReleaseTestSdkVersion)</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down
2 changes: 1 addition & 1 deletion test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>
<!-- We need to define NuGet references using this newer style for running tests locally in VS to work.
However, for some reason, specifially in lab builds, using the below to resolve NuGet references
causes it to complain that the uap10.0.14393 framework wasn't referenced.
causes it to complain that the uap10.0.15063 framework wasn't referenced.
As such, we'll use the more old-school package.json NuGet reference format for lab builds. -->
<PropertyGroup Condition="'$(XES_DFSDROP)' == ''">
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
Expand Down
2 changes: 1 addition & 1 deletion test/MUXControlsTestApp/MSTest/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"DiffPlex": "1.2.1"
},
"frameworks": {
"uap10.0.14393": {}
"uap10.0.15063": {}
},
"runtimes": {
"win10-x86": {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down
2 changes: 1 addition & 1 deletion test/MUXControlsTestApp/TAEF/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"Win2D.uwp": "1.22.0"
},
"frameworks": {
"uap10.0.14393": {}
"uap10.0.15063": {}
},
"runtimes": {
"win10-x86": {},
Expand Down
Loading

0 comments on commit 3b631bd

Please sign in to comment.