diff --git a/README.md b/README.md index d8ebc2f2b9..6ccced30ed 100644 --- a/README.md +++ b/README.md @@ -82,11 +82,11 @@ You don't need version checks or conditional XAML markup to use WinUI controls o ### Version support -The Microsoft.UI.Xaml 2.7 NuGet package requires your project to have TargetPlatformVersion >= 10.0.18362.0 and TargetPlatformMinVersion >= 10.0.15063.0 when building. +The Microsoft.UI.Xaml 2.7 NuGet package requires your project to have TargetPlatformVersion >= 10.0.18362.0 and TargetPlatformMinVersion >= 10.0.17763.0 when building. Your app's users can be on any of the following supported Windows 10 versions: -* Windows 10 1703 - Build 15063 (Creators Update aka "Redstone 2") and newer (including Windows Insider Previews) +* Windows 10 1809 - Build 17763 (Creators Update aka "Redstone 5") and newer (including Windows Insider Previews) Some features may have a reduced or slightly different user experience on older versions. diff --git a/build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml b/build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml index 3d8349fb50..92e2c6eeb0 100644 --- a/build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml @@ -107,7 +107,7 @@ jobs: parameters: condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite')) testBinaryDirectoryPath: '$(Build.SourcesDirectory)\HelixPayload\$(buildConfiguration)\$(buildPlatform)' - testFilePattern: 'MUXControlsTestApp.appx' + testFilePattern: 'MUXControlsTestApp.msix' outputProjFileName: 'RunTestsInHelix-ApiTests.proj' taefQuery: ${{ parameters.taefQuery }} @@ -115,7 +115,7 @@ jobs: parameters: condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite')) testBinaryDirectoryPath: '$(Build.SourcesDirectory)\HelixPayload\$(buildConfiguration)\$(buildPlatform)' - testFilePattern: 'IXMPTestApp.appx' + testFilePattern: 'IXMPTestApp.msix' outputProjFileName: 'RunTestsInHelix-IXMPTestAppTests.proj' taefQuery: ${{ parameters.taefQuery }} diff --git a/build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml b/build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml index 363b7c3537..828cfdd9a0 100644 --- a/build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml +++ b/build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml @@ -12,7 +12,7 @@ - + diff --git a/build/Helix/scripts/TestPass-PreRun.ps1 b/build/Helix/scripts/TestPass-PreRun.ps1 index 849313f8cb..0460eea050 100644 --- a/build/Helix/scripts/TestPass-PreRun.ps1 +++ b/build/Helix/scripts/TestPass-PreRun.ps1 @@ -53,6 +53,11 @@ $versionMajor = $versionData.GetElementsByTagName("MUXVersionMajor").'#text' $versionMinor = $versionData.GetElementsByTagName("MUXVersionMinor").'#text' UninstallTestApps("Microsoft.UI.Xaml.$versionMajor.$versionMinor") +$certs = Get-ChildItem *.cer +foreach($cert in $certs) +{ + certutil -addstore TrustedPeople $cert.Name +} .\InstallTestAppDependencies.ps1 diff --git a/build/NuSpecs/MUXControls-Nuget-Common.targets b/build/NuSpecs/MUXControls-Nuget-Common.targets index d10cb40959..e70d386725 100644 --- a/build/NuSpecs/MUXControls-Nuget-Common.targets +++ b/build/NuSpecs/MUXControls-Nuget-Common.targets @@ -8,8 +8,8 @@ $([System.Version]::Parse('$(TargetPlatformMinVersion)').Build) + Text="Microsoft.UI.Xaml nuget package requires TargetPlatformMinVersion >= 10.0.17763.0 (current project is $(MicrosoftUIXamlTargetPlatformMinCheckValue))" + Condition="$(MicrosoftUIXamlTargetPlatformMinCheckValue) < 17763" /> $([System.Version]::Parse('$(TargetPlatformVersion)').Build) diff --git a/dev/InfoBadge/APITests/InfoBadgeTests.cs b/dev/InfoBadge/APITests/InfoBadgeTests.cs index 3de2a277ff..dfdf98242f 100644 --- a/dev/InfoBadge/APITests/InfoBadgeTests.cs +++ b/dev/InfoBadge/APITests/InfoBadgeTests.cs @@ -172,7 +172,7 @@ public void InfoBadgeValueLessThanNegativeOneCrashes() RunOnUIThread.Execute(() => { - Verify.Throws(() => { infoBadge.Value = -10; }); + Verify.Throws(() => { infoBadge.Value = -10; }); }); } } diff --git a/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj b/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj index 7f0242af53..a124489f85 100644 --- a/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj +++ b/dev/Microsoft.UI.Xaml.FrameworkPackagePRI/Microsoft.UI.Xaml.FrameworkPackagePRI.csproj @@ -15,7 +15,7 @@ en-US UAP $(MuxSdkVersion) - 10.0.15063.0 + 10.0.17763.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/dev/dll/Microsoft.UI.Xaml.Common.props b/dev/dll/Microsoft.UI.Xaml.Common.props index c585bbd8a9..0803b741ab 100644 --- a/dev/dll/Microsoft.UI.Xaml.Common.props +++ b/dev/dll/Microsoft.UI.Xaml.Common.props @@ -17,7 +17,7 @@ true Windows Store $(MuxSdkVersion) - 10.0.15063.0 + 10.0.17763.0 10.0 x64 diff --git a/test/IXMPTestApp/IXMPTestApp.Shared.projitems b/test/IXMPTestApp/IXMPTestApp.Shared.projitems index e962e6e4f6..0fe58a37bd 100644 --- a/test/IXMPTestApp/IXMPTestApp.Shared.projitems +++ b/test/IXMPTestApp/IXMPTestApp.Shared.projitems @@ -23,7 +23,7 @@ en-US UAP $(MuxSdkVersion) - 10.0.15063.0 + 10.0.17763.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/test/IXMPTestApp/Package.appxmanifest b/test/IXMPTestApp/Package.appxmanifest index 76a14a8315..8c4778faeb 100644 --- a/test/IXMPTestApp/Package.appxmanifest +++ b/test/IXMPTestApp/Package.appxmanifest @@ -9,7 +9,7 @@ Assets\StoreLogo.png - + diff --git a/test/IXMPTestApp/TAEF/project.json b/test/IXMPTestApp/TAEF/project.json index 31743b2267..a29b77d94e 100644 --- a/test/IXMPTestApp/TAEF/project.json +++ b/test/IXMPTestApp/TAEF/project.json @@ -6,7 +6,7 @@ "TAEF.Redist.Wlk": "10.31.180822002" }, "frameworks": { - "uap10.0.15063": {} + "uap10.0.17763": {} }, "runtimes": { "win10-x86": {}, diff --git a/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj b/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj index 6ce3c62fb9..5c27adb2c9 100644 --- a/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj +++ b/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj @@ -15,9 +15,7 @@ en-US UAP $(MuxSdkVersion) - 10.0.15063.0 - - $(SDKVersionRS3) + 10.0.17763.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/test/MUXControlsReleaseTest/LibraryThatUsesMUX/LibraryThatUsesMUX.csproj b/test/MUXControlsReleaseTest/LibraryThatUsesMUX/LibraryThatUsesMUX.csproj index d8cd821119..2b70efc608 100644 --- a/test/MUXControlsReleaseTest/LibraryThatUsesMUX/LibraryThatUsesMUX.csproj +++ b/test/MUXControlsReleaseTest/LibraryThatUsesMUX/LibraryThatUsesMUX.csproj @@ -13,9 +13,7 @@ en-US UAP $(MuxSdkVersion) - 10.0.15063.0 - - $(SDKVersionRS3) + 10.0.17763.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/MUXControls.ReleaseTest.Shared.projitems b/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/MUXControls.ReleaseTest.Shared.projitems index e549542f61..3d4cc4e577 100644 --- a/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/MUXControls.ReleaseTest.Shared.projitems +++ b/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/MUXControls.ReleaseTest.Shared.projitems @@ -21,7 +21,7 @@ MUXControls.ReleaseTest MUXControls.ReleaseTest $(ReleaseTestSdkVersion) - 10.0.15063.0 + 10.0.17763.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj b/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj index b43684b066..c909c7e1eb 100644 --- a/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj +++ b/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj @@ -15,9 +15,7 @@ en-US UAP $(MuxSdkVersion) - 10.0.15063.0 - - $(SDKVersionRS3) + 10.0.17763.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj index 0abda498dc..1ba9a1dd06 100644 --- a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj +++ b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj @@ -12,7 +12,7 @@ true Windows Store $(MuxSdkVersion) - 10.0.15063.0 + 10.0.17763.0 10.0 $(Platform) x86 diff --git a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec index e150cafdda..f5ae83e010 100644 --- a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec +++ b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec @@ -10,7 +10,7 @@ © Microsoft Corporation. All rights reserved. false - + diff --git a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.vcxproj b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.vcxproj index 21d49145bd..83106dc17c 100644 --- a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.vcxproj +++ b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.vcxproj @@ -15,7 +15,7 @@ Windows Store 10.0 $(MuxSdkVersion) - 10.0.15063.0 + 10.0.17763.0 false diff --git a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems index f917745fc1..dc890834cc 100644 --- a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems +++ b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems @@ -25,7 +25,7 @@ en-US UAP $(MuxSdkVersion) - 10.0.15063.0 + 10.0.17763.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/test/MUXControlsTestApp/TAEF/project.json b/test/MUXControlsTestApp/TAEF/project.json index 177ab61d17..4e43770971 100644 --- a/test/MUXControlsTestApp/TAEF/project.json +++ b/test/MUXControlsTestApp/TAEF/project.json @@ -9,7 +9,7 @@ "Win2D.uwp": "1.22.0" }, "frameworks": { - "uap10.0.15063": {} + "uap10.0.17763": {} }, "runtimes": { "win10-x86": {}, diff --git a/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.projitems b/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.projitems index e5ffb97781..15a3570b11 100644 --- a/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.projitems +++ b/test/MUXExperimentalTest/MUXExperimental.Test/MUXExperimental.Test.Shared.projitems @@ -20,7 +20,7 @@ MUXExperimental.Test MUXExperimental.Test $(ReleaseTestSdkVersion) - 10.0.15063.0 + 10.0.17763.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj b/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj index ddf060ceaa..ad603adf42 100644 --- a/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj +++ b/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj @@ -14,7 +14,7 @@ en-US UAP $(MuxSdkVersion) - 10.0.15063.0 + 10.0.17763.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/test/TestAppCX/TestAppCX.vcxproj b/test/TestAppCX/TestAppCX.vcxproj index a042ceef2c..a0284467f0 100644 --- a/test/TestAppCX/TestAppCX.vcxproj +++ b/test/TestAppCX/TestAppCX.vcxproj @@ -12,7 +12,7 @@ true Windows Store $(MuxSdkVersion) - 10.0.15063.0 + 10.0.17763.0 10.0 ..\..\build\WinUITest.pfx diff --git a/test/testinfra/AppTestAutomationHelpers/AppTestAutomationHelpers.vcxproj b/test/testinfra/AppTestAutomationHelpers/AppTestAutomationHelpers.vcxproj index 4cec9bd362..683938c972 100644 --- a/test/testinfra/AppTestAutomationHelpers/AppTestAutomationHelpers.vcxproj +++ b/test/testinfra/AppTestAutomationHelpers/AppTestAutomationHelpers.vcxproj @@ -15,7 +15,7 @@ Windows Store 10.0 10.0.18362.0 - 10.0.15063.0 + 10.0.17763.0 false