diff --git a/.gitignore b/.gitignore
index 5ec9072e6b..a4031ef825 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
+*.pfx
+*.cer
+
# User-specific files
*.suo
*.user
diff --git a/GenerateTestPfx.ps1 b/GenerateTestPfx.ps1
new file mode 100644
index 0000000000..702f66cf77
--- /dev/null
+++ b/GenerateTestPfx.ps1
@@ -0,0 +1,12 @@
+$CertificateFriendlyName = "WinUITest"
+$Publisher = "CN=WinUITest"
+
+$cert = New-SelfSignedCertificate -Type Custom `
+ -Subject $Publisher `
+ -KeyUsage DigitalSignature `
+ -FriendlyName $CertificateFriendlyName `
+ -CertStoreLocation "Cert:\CurrentUser\My" `
+ -TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.3", "2.5.29.19={text}")
+
+$certificateBytes = $cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Pkcs12)
+[System.IO.File]::WriteAllBytes("$PSScriptRoot\build\WinUITest.pfx", $certificateBytes)
\ No newline at end of file
diff --git a/MUXControls.sln b/MUXControls.sln
index a7236c533f..cfbfa99a54 100644
--- a/MUXControls.sln
+++ b/MUXControls.sln
@@ -70,12 +70,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ColorPicker_APITests", "dev
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ColorPicker_InteractionTests", "dev\ColorPicker\InteractionTests\ColorPicker_InteractionTests.shproj", "{A4D2FAE8-E7FC-4100-91FF-2202FAC91C70}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TREXDefs", "TREXDefs", "{1739D66B-9813-4370-AF65-2D297DA28016}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "x86", "x86", "{CECCF922-C9B8-430B-942D-E1ADB6EC3359}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "amd64", "amd64", "{B651FAF5-92D5-4574-B2FB-18B0C1AF0738}"
-EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RatingControl_APITests", "dev\RatingControl\APITests\RatingControl_APITests.shproj", "{274B93F7-CD18-4ED9-B569-0640529D187B}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ScrollView_APITests", "dev\ScrollView\APITests\ScrollView_APITests.shproj", "{374B93F8-DD19-5EDA-C56A-1640529D187C}"
@@ -108,7 +102,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{F11E
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FrameworkPackage", "FrameworkPackage", "{447F5D0D-9189-4B8A-BCDC-0FE67646DE97}"
ProjectSection(SolutionItems) = preProject
- build\FrameworkPackage\FrameworkPackage.csproj = build\FrameworkPackage\FrameworkPackage.csproj
build\FrameworkPackage\MakeFrameworkPackage.cmd = build\FrameworkPackage\MakeFrameworkPackage.cmd
build\FrameworkPackage\MakeFrameworkPackage.ps1 = build\FrameworkPackage\MakeFrameworkPackage.ps1
EndProjectSection
@@ -263,28 +256,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Repeater_APITests", "dev\Re
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Repeater_InteractionTests", "dev\Repeater\InteractionTests\Repeater_InteractionTests.shproj", "{999E00C9-0E58-402A-8E0E-CBAFB0ADC7E3}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeCoverage", "CodeCoverage", "{5FE8E48E-0A1E-4443-B0B7-B6F25A96829E}"
- ProjectSection(SolutionItems) = preProject
- tools\CodeCoverage\CodeCoverage.psm1 = tools\CodeCoverage\CodeCoverage.psm1
- tools\CodeCoverage\CreateCodeCoverageReport.cmd = tools\CodeCoverage\CreateCodeCoverageReport.cmd
- tools\CodeCoverage\CreateCodeCoverageReport.ps1 = tools\CodeCoverage\CreateCodeCoverageReport.ps1
- tools\CodeCoverage\CreateCodeCoverageReportWrapper.cmd = tools\CodeCoverage\CreateCodeCoverageReportWrapper.cmd
- tools\CodeCoverage\InstrumentBinaries.cmd = tools\CodeCoverage\InstrumentBinaries.cmd
- tools\CodeCoverage\InstrumentBinaries.ps1 = tools\CodeCoverage\InstrumentBinaries.ps1
- tools\CodeCoverage\PkgGen.cmd = tools\CodeCoverage\PkgGen.cmd
- tools\CodeCoverage\PostBuild.cmd = tools\CodeCoverage\PostBuild.cmd
- tools\CodeCoverage\PostBuildWrapper.cmd = tools\CodeCoverage\PostBuildWrapper.cmd
- tools\CodeCoverage\PushCodeCoverageData.ps1 = tools\CodeCoverage\PushCodeCoverageData.ps1
- tools\CodeCoverage\PushCodeCoverageSymbols.cmd = tools\CodeCoverage\PushCodeCoverageSymbols.cmd
- tools\CodeCoverage\PushCodeCoverageSymbols.ps1 = tools\CodeCoverage\PushCodeCoverageSymbols.ps1
- tools\CodeCoverage\StartCodeCoverage.ps1 = tools\CodeCoverage\StartCodeCoverage.ps1
- tools\CodeCoverage\StopCodeCoverage.ps1 = tools\CodeCoverage\StopCodeCoverage.ps1
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "amd64_CodeCoverage", "amd64_CodeCoverage", "{23ED12A5-D2CB-4D6C-82B7-2D18060699F6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "x86_CodeCoverage", "x86_CodeCoverage", "{5BD2E9D8-DC70-4CA9-91CD-B38746E68746}"
-EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Reveal_APITests", "dev\Materials\Reveal\APITests\Reveal_APITests.shproj", "{5049EA6C-88CE-4ED5-8692-947EEC9E52BC}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ScrollViewerAdapter_InteractionTests", "dev\PullToRefresh\ScrollViewerIRefreshInfoProviderAdapter\InteractionTests\ScrollViewerAdapter_InteractionTests.shproj", "{79863454-1DBF-45BB-B3D3-420B8F5E8705}"
@@ -293,18 +264,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconSource", "IconSource",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IconSource", "dev\IconSource\IconSource.vcxitems", "{19FFFF77-4814-4AD6-ACD7-42C6A50AB0D8}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsPorting", "WindowsPorting", "{EE9F64DF-7F2B-45F0-82AA-F0DFF577AB82}"
- ProjectSection(SolutionItems) = preProject
- tools\WindowsPorting\Cleanup.cmd = tools\WindowsPorting\Cleanup.cmd
- tools\WindowsPorting\PerformMUXControlsPort.cmd = tools\WindowsPorting\PerformMUXControlsPort.cmd
- tools\WindowsPorting\PkgGenOS.cmd = tools\WindowsPorting\PkgGenOS.cmd
- tools\WindowsPorting\PublishSources.cmd = tools\WindowsPorting\PublishSources.cmd
- tools\WindowsPorting\PublishSourcesWrapper.cmd = tools\WindowsPorting\PublishSourcesWrapper.cmd
- tools\WindowsPorting\SetParentVariables.cmd = tools\WindowsPorting\SetParentVariables.cmd
- tools\WindowsPorting\SetSyncToWindowsVariables.cmd = tools\WindowsPorting\SetSyncToWindowsVariables.cmd
- tools\WindowsPorting\SetSyncToWindowsVariablesWrapper.cmd = tools\WindowsPorting\SetSyncToWindowsVariablesWrapper.cmd
- EndProjectSection
-EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "IconSource_APITests", "dev\IconSource\APITests\IconSource_APITests.shproj", "{D73627E9-564C-4A72-A12D-F6C82F17AD0D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TwoPaneView", "TwoPaneView", "{8211954E-FE33-469C-87C7-9C863ACE1759}"
@@ -323,15 +282,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PTRTracing", "PTRTracing",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTRTracing", "dev\PullToRefresh\PTRTracing\PTRTracing.vcxitems", "{890A5548-0515-4099-B526-0539FE9A0376}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptsToCopy", "ScriptsToCopy", "{06BD5D83-CB4B-4FA9-8931-89BDB212B9AF}"
- ProjectSection(SolutionItems) = preProject
- tools\WindowsPorting\ScriptsToCopy\buildcontrols.cmd = tools\WindowsPorting\ScriptsToCopy\buildcontrols.cmd
- tools\WindowsPorting\ScriptsToCopy\CommitSync.cmd = tools\WindowsPorting\ScriptsToCopy\CommitSync.cmd
- tools\WindowsPorting\ScriptsToCopy\CommitSync.ps1 = tools\WindowsPorting\ScriptsToCopy\CommitSync.ps1
- tools\WindowsPorting\ScriptsToCopy\SyncToMUXControls.cmd = tools\WindowsPorting\ScriptsToCopy\SyncToMUXControls.cmd
- tools\WindowsPorting\ScriptsToCopy\SyncToMUXControls.ps1 = tools\WindowsPorting\ScriptsToCopy\SyncToMUXControls.ps1
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interactions", "Interactions", "{3393A555-DA02-4310-AC37-129EE88661A0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ButtonInteraction", "ButtonInteraction", "{5D192660-07E0-4176-AE0A-EFEBAFA3C315}"
@@ -1421,9 +1371,6 @@ Global
{395A71A1-4327-477B-85D4-AF0851732CCB} = {5654F115-F01A-495B-91C7-09408ABF14F0}
{E9AC4938-EC2A-46D3-85BF-27316DB8CC4D} = {1F86207F-AF12-4C39-8ACD-AE751D312673}
{A4D2FAE8-E7FC-4100-91FF-2202FAC91C70} = {1F86207F-AF12-4C39-8ACD-AE751D312673}
- {1739D66B-9813-4370-AF65-2D297DA28016} = {5EF3865D-EFAC-4676-B1E6-FB09DD7C67FD}
- {CECCF922-C9B8-430B-942D-E1ADB6EC3359} = {1739D66B-9813-4370-AF65-2D297DA28016}
- {B651FAF5-92D5-4574-B2FB-18B0C1AF0738} = {1739D66B-9813-4370-AF65-2D297DA28016}
{274B93F7-CD18-4ED9-B569-0640529D187B} = {3B0C114B-AC74-4BB1-975D-26FE5D505BD1}
{374B93F8-DD19-5EDA-C56A-1640529D187C} = {4B0C114C-BC75-5BB2-A75E-36FE5D505BD2}
{374B93F7-CD18-4ED9-B569-0640529D187C} = {438CED23-DAB1-495E-9A72-0FF38E01EB80}
@@ -1498,14 +1445,10 @@ Global
{2ED883F5-20DB-4445-8C96-517A21E5E657} = {440DB3C5-0EFF-4F78-AD39-0C147230ABD3}
{8D2DA979-6313-49E2-8CF3-B568436D2944} = {440DB3C5-0EFF-4F78-AD39-0C147230ABD3}
{999E00C9-0E58-402A-8E0E-CBAFB0ADC7E3} = {440DB3C5-0EFF-4F78-AD39-0C147230ABD3}
- {5FE8E48E-0A1E-4443-B0B7-B6F25A96829E} = {5EF3865D-EFAC-4676-B1E6-FB09DD7C67FD}
- {23ED12A5-D2CB-4D6C-82B7-2D18060699F6} = {1739D66B-9813-4370-AF65-2D297DA28016}
- {5BD2E9D8-DC70-4CA9-91CD-B38746E68746} = {1739D66B-9813-4370-AF65-2D297DA28016}
{5049EA6C-88CE-4ED5-8692-947EEC9E52BC} = {CE762527-4CC8-4604-A0DD-9EA4CB29C4A9}
{79863454-1DBF-45BB-B3D3-420B8F5E8705} = {CD99B535-DFD9-4A17-A2BC-113E93DDE42A}
{E220EFAB-BA88-458D-A271-279B6630E864} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
{19FFFF77-4814-4AD6-ACD7-42C6A50AB0D8} = {E220EFAB-BA88-458D-A271-279B6630E864}
- {EE9F64DF-7F2B-45F0-82AA-F0DFF577AB82} = {5EF3865D-EFAC-4676-B1E6-FB09DD7C67FD}
{D73627E9-564C-4A72-A12D-F6C82F17AD0D} = {E220EFAB-BA88-458D-A271-279B6630E864}
{8211954E-FE33-469C-87C7-9C863ACE1759} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
{8D0E4610-B51D-45C1-8B82-240BD2F73A92} = {8211954E-FE33-469C-87C7-9C863ACE1759}
@@ -1515,7 +1458,6 @@ Global
{848448D5-F717-4F88-8F99-311CD60587FA} = {5654F115-F01A-495B-91C7-09408ABF14F0}
{B4CF2535-396D-40AB-9028-D44233B31AE2} = {B1242C40-BBB3-4490-A936-5C71A3BE8336}
{890A5548-0515-4099-B526-0539FE9A0376} = {B4CF2535-396D-40AB-9028-D44233B31AE2}
- {06BD5D83-CB4B-4FA9-8931-89BDB212B9AF} = {EE9F64DF-7F2B-45F0-82AA-F0DFF577AB82}
{3393A555-DA02-4310-AC37-129EE88661A0} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
{5D192660-07E0-4176-AE0A-EFEBAFA3C315} = {3393A555-DA02-4310-AC37-129EE88661A0}
{8DC0EA14-D850-4C6E-8918-BEEB89E877BD} = {5D192660-07E0-4176-AE0A-EFEBAFA3C315}
diff --git a/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml b/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
index 1641774937..71d0f224bf 100644
--- a/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
+++ b/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
@@ -64,6 +64,12 @@ jobs:
downloadPath: $(artifactDownloadPath)
itemPattern: '**\*.nupkg'
+ - task: powershell@2
+ displayName: GenerateTestPFX.ps1
+ inputs:
+ targetType: filePath
+ filePath: GenerateTestPFX.ps1
+
# Copy nupkg to localpackages and update proj file to point to it
- powershell: |
$pathToNupkg = "$($env:artifactDownloadPath)\drop"
diff --git a/build/FrameworkPackage/FrameworkPackage.csproj b/build/FrameworkPackage/FrameworkPackage.csproj
deleted file mode 100644
index 5eb1a6bcf9..0000000000
--- a/build/FrameworkPackage/FrameworkPackage.csproj
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
-
- Debug
- ARM
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- ARM
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
-
- {ad0c90b0-4845-4d4b-88f1-86f653f8171b}
- Microsoft.UI.Xaml
-
-
- {4306d182-e889-4b73-8606-1e815d389659}
- MUXControls
-
-
-
-
-
-
-
-
-
-
- {49C6EF1B-58AB-4E44-AF63-054106255A80}
- StaticLibrary
- FrameworkPackage
- en-US
- 14.0
- true
- Windows Store
- 10.0.18362.0
- 10.0.15063.0
- 10.0
-
-
-
- StaticLibrary
- true
- v140
-
-
- StaticLibrary
- true
- v140
-
-
- StaticLibrary
- true
- v140
-
-
- StaticLibrary
- false
- true
- v140
-
-
- StaticLibrary
- false
- true
- v140
-
-
- StaticLibrary
- false
- true
- v140
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- Use
- false
- true
-
-
- Console
- false
- false
-
-
-
-
- %WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe
- $(OutputPath)\MUXControls.$(PlatformShortName).appx
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build/FrameworkPackage/MakeFrameworkPackage.ps1 b/build/FrameworkPackage/MakeFrameworkPackage.ps1
index ab2db976c2..5b79cd961d 100644
--- a/build/FrameworkPackage/MakeFrameworkPackage.ps1
+++ b/build/FrameworkPackage/MakeFrameworkPackage.ps1
@@ -317,7 +317,19 @@ $priOutputPath = [IO.Path]::GetFullPath("$fullOutputPath\resources.pri")
$priCBSOutputPath = [IO.Path]::GetFullPath("$fullOutputPath\CBSresources.pri")
$noiseAssetPath = [IO.Path]::GetFullPath("$fullOutputPath\Assets\NoiseAsset_256x256_PNG.png")
$resourceContents = [IO.Path]::GetFullPath("$fullOutputPath\Resources")
-$pfxPath = [IO.Path]::GetFullPath("..\MSTest.pfx")
+
+$pfxPath = [IO.Path]::GetFullPath("MSTest.pfx")
+$CertificateFriendlyName = "MSTest"
+
+$cert = New-SelfSignedCertificate -Type Custom `
+ -Subject $Publisher `
+ -KeyUsage DigitalSignature `
+ -FriendlyName $CertificateFriendlyName `
+ -CertStoreLocation "Cert:\CurrentUser\My" `
+ -TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.3", "2.5.29.19={text}")
+
+$certificateBytes = $cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Pkcs12)
+[System.IO.File]::WriteAllBytes($pfxPath, $certificateBytes)
pushd $fullOutputPath\PackageContents
@@ -355,24 +367,7 @@ Write-Host $makeappx
cmd /c $makeappx
if ($LastExitCode -ne 0) { Exit 1 }
-if ($env:TFS_ToolsDirectory -and ($env:BUILD_DEFINITIONNAME -match "release") -and $env:UseSimpleSign)
-{
- # From MakeAppxBundle in the XES tools
- $signToolPath = $env:TFS_ToolsDirectory + "\bin\SimpleSign.exe"
- if (![System.IO.File]::Exists($signToolPath))
- {
- $signToolPath = "SimpleSign.exe"
- }
-
- # From here: https://osgwiki.com/wiki/Package_ES_Appx_Bundle#Code_sign_Appx_Bundle
- $signCert = "136020001"
-
- $signtool = "`"$signToolPath`" -i:`"$outputAppxFileFullPath`" -c:$signCert -s:`"CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US`""
-}
-else
-{
- $signtool = "`"" + (Join-Path $WindowsSdkBinDir "signtool.exe") + "`" sign /a /v /fd SHA256 /f $pfxPath $outputAppxFileFullPath"
-}
+$signtool = "`"" + (Join-Path $WindowsSdkBinDir "signtool.exe") + "`" sign /a /v /fd SHA256 /f $pfxPath $outputAppxFileFullPath"
Write-Host $signtool
cmd /c $signtool
if ($LastExitCode -ne 0) { Exit 1 }
diff --git a/build/Helix/scripts/TestPass-PreRun.ps1 b/build/Helix/scripts/TestPass-PreRun.ps1
index 9f296d9d6e..849313f8cb 100644
--- a/build/Helix/scripts/TestPass-PreRun.ps1
+++ b/build/Helix/scripts/TestPass-PreRun.ps1
@@ -21,7 +21,7 @@ function UninstallTestApps {
# which prevents other versions of the app from being installed.
# To handle this, we can directly call Remove-AppxPackage against the full name of the package. However, without
# Get-AppxPackage to find the PackageFullName, we just have to manually construct the name.
- $packageFullName = "$($pkgName)_1.0.0.0_$($Platform)__8wekyb3d8bbwe"
+ $packageFullName = "$($pkgName)_1.0.0.0_$($Platform)__6f07fta6qpts2"
Write-Host "Removing $packageFullName if installed"
Remove-AppxPackage $packageFullName -ErrorVariable appxerror -ErrorAction SilentlyContinue
if($appxerror)
diff --git a/build/MSTest.cer b/build/MSTest.cer
deleted file mode 100644
index 7aae8b5eba..0000000000
Binary files a/build/MSTest.cer and /dev/null differ
diff --git a/build/MSTest.pfx b/build/MSTest.pfx
deleted file mode 100644
index 3f0e1be35f..0000000000
Binary files a/build/MSTest.pfx and /dev/null differ
diff --git a/dev/WebView2/TestUI/WebView2Common.cs b/dev/WebView2/TestUI/WebView2Common.cs
index 2c368efd76..94fdd27738 100644
--- a/dev/WebView2/TestUI/WebView2Common.cs
+++ b/dev/WebView2/TestUI/WebView2Common.cs
@@ -46,7 +46,7 @@ public void CopyTestPagesLocally()
}
// [Desktop (Packaged)] Get a file:// URI for the test page from app's Assets folder
- // Ex: file:///C:/Program%20Files/WindowsApps/MUXControlsTestApp.Desktop_1.0.0.0_x86__8wekyb3d8bbwe/Assets/SimplePage.html
+ // Ex: file:///C:/Program%20Files/WindowsApps/MUXControlsTestApp.Desktop_1.0.0.0_x86__6f07fta6qpts2/Assets/SimplePage.html
public static Uri GetTestPageUri(string testPageName)
{
string appDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
@@ -87,7 +87,7 @@ async public void CopyTestPagesLocally()
}
// UWP Version: Get a file:// URI for the test page in app data (can be loaded by Anahaeim)
- // Ex: file:///C:/Users//AppData/Local/Packages/MUXControlsTestApp_8wekyb3d8bbwe/TempState/SimplePage.htm
+ // Ex: file:///C:/Users//AppData/Local/Packages/MUXControlsTestApp_6f07fta6qpts2/TempState/SimplePage.htm
public static Uri GetTestPageUri(string testPageName)
{
string localAppDataPath = AppDataPaths.GetDefault().LocalAppData;
diff --git a/dev/dll/Microsoft.UI.Xaml.Common.targets b/dev/dll/Microsoft.UI.Xaml.Common.targets
index e4ffd660e4..16c87021d5 100644
--- a/dev/dll/Microsoft.UI.Xaml.Common.targets
+++ b/dev/dll/Microsoft.UI.Xaml.Common.targets
@@ -757,5 +757,13 @@
$(_LceFile)
+
+
+ $(MSBuildProjectDirectory)\..\..\GenerateTestPfx.ps1
+ $(MSBuildProjectDirectory)\..\..\build\WinUITest.pfx
+
+
+
+
diff --git a/test/IXMPTestApp/IXMPTestApp.Shared.projitems b/test/IXMPTestApp/IXMPTestApp.Shared.projitems
index e07d40bf44..e962e6e4f6 100644
--- a/test/IXMPTestApp/IXMPTestApp.Shared.projitems
+++ b/test/IXMPTestApp/IXMPTestApp.Shared.projitems
@@ -27,7 +27,7 @@
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- $(MSBuildThisFileDirectory)\..\..\build\MSTest.pfx
+ $(MSBuildThisFileDirectory)\..\..\build\WinUITest.pfx
IXMPTestApp
true
@@ -131,7 +131,7 @@
-
+
diff --git a/test/IXMPTestApp/Package.appxmanifest b/test/IXMPTestApp/Package.appxmanifest
index 6b629882c1..76a14a8315 100644
--- a/test/IXMPTestApp/Package.appxmanifest
+++ b/test/IXMPTestApp/Package.appxmanifest
@@ -1,6 +1,6 @@
-
+
diff --git a/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj b/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj
index 8693cd05a3..6ce3c62fb9 100644
--- a/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj
+++ b/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj
@@ -22,7 +22,7 @@
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
true
- ..\..\..\build\MSTest.pfx
+ ..\..\..\build\WinUITest.pfx
AppThatUsesMUXIndirectly
False
False
@@ -133,7 +133,7 @@
Designer
-
+
diff --git a/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/Package.appxmanifest b/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/Package.appxmanifest
index 89b4d938a0..1f0ae10f86 100644
--- a/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/Package.appxmanifest
+++ b/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/Package.appxmanifest
@@ -5,7 +5,7 @@
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
IgnorableNamespaces="uap mp">
-
+
AppThatUsesMUXIndirectly
diff --git a/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj b/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj
index df296ec93b..b43684b066 100644
--- a/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj
+++ b/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj
@@ -22,7 +22,7 @@
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
true
- ..\..\..\build\MSTest.pfx
+ ..\..\..\build\WinUITest.pfx
NugetPackageTestApp
False
False
@@ -152,7 +152,7 @@
Designer
-
+
diff --git a/test/MUXControlsReleaseTest/NugetPackageTestApp/Package.appxmanifest b/test/MUXControlsReleaseTest/NugetPackageTestApp/Package.appxmanifest
index 603bc6774f..a8e94a24d0 100644
--- a/test/MUXControlsReleaseTest/NugetPackageTestApp/Package.appxmanifest
+++ b/test/MUXControlsReleaseTest/NugetPackageTestApp/Package.appxmanifest
@@ -1,6 +1,6 @@
-
+
NugetPackageTestApp
diff --git a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj
index 97b4abfac8..0abda498dc 100644
--- a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj
+++ b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj
@@ -129,7 +129,7 @@
- ..\..\..\build\MSTest.pfx
+ ..\..\..\build\WinUITest.pfx
NugetPackageTestAppCX
@@ -206,7 +206,7 @@
Designer
-
+
diff --git a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj.filters b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj.filters
index 71fbb260da..0d1cc077ea 100644
--- a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj.filters
+++ b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj.filters
@@ -49,7 +49,7 @@
-
+
diff --git a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/Package.appxmanifest b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/Package.appxmanifest
index 012d7080a2..d8a9e0732e 100644
--- a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/Package.appxmanifest
+++ b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/Package.appxmanifest
@@ -8,7 +8,7 @@
diff --git a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX_TemporaryKey.pfx b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX_TemporaryKey.pfx
deleted file mode 100644
index 6bca8f1fc3..0000000000
Binary files a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX_TemporaryKey.pfx and /dev/null differ
diff --git a/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess/Package.appxmanifest b/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess/Package.appxmanifest
index f030f27476..ffe9160b07 100644
--- a/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess/Package.appxmanifest
+++ b/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess/Package.appxmanifest
@@ -1,6 +1,6 @@
-
+
UwpAppWithFullTrustProcess
diff --git a/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess_package/Package.appxmanifest b/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess_package/Package.appxmanifest
index 57edd38e5d..f9de37ce4c 100644
--- a/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess_package/Package.appxmanifest
+++ b/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess_package/Package.appxmanifest
@@ -1,6 +1,6 @@
-
+
UwpAppWithFullTrustProcess_package
Microsoft Corporation
diff --git a/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess_package/UwpAppWithFullTrustProcess_package.wapproj b/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess_package/UwpAppWithFullTrustProcess_package.wapproj
index 65bc24e368..9e7f506c2a 100644
--- a/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess_package/UwpAppWithFullTrustProcess_package.wapproj
+++ b/test/MUXControlsReleaseTest/UwpAppWithFullTrustProcess/UwpAppWithFullTrustProcess_package/UwpAppWithFullTrustProcess_package.wapproj
@@ -51,7 +51,7 @@
False
True
UwpAppWithFullTrustProcess_package
- ..\..\..\..\build\MSTest.pfx
+ ..\..\..\..\build\WinUITest.pfx
Never
diff --git a/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/Package.appxmanifest b/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/Package.appxmanifest
index 5003c0cee5..226a471a83 100644
--- a/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/Package.appxmanifest
+++ b/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/Package.appxmanifest
@@ -8,7 +8,7 @@
diff --git a/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/WpfApp.Package.wapproj b/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/WpfApp.Package.wapproj
index 84337123cc..fb40f953c9 100644
--- a/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/WpfApp.Package.wapproj
+++ b/test/MUXControlsReleaseTest/XamlIslandsTestApp/WpfApp/WpfApp.Package.wapproj
@@ -37,7 +37,7 @@
WpfApp.csproj
WpfApp
WpfApp
- ..\..\..\..\build\MSTest.pfx
+ ..\..\..\..\build\WinUITest.pfx
false
diff --git a/test/MUXControlsTestApp.ApiTests/Package.appxmanifest b/test/MUXControlsTestApp.ApiTests/Package.appxmanifest
index 1ce3a3147b..f66558ae4c 100644
--- a/test/MUXControlsTestApp.ApiTests/Package.appxmanifest
+++ b/test/MUXControlsTestApp.ApiTests/Package.appxmanifest
@@ -1,6 +1,6 @@
-
+
diff --git a/test/MUXControlsTestApp/MSTest/Package.appxmanifest b/test/MUXControlsTestApp/MSTest/Package.appxmanifest
index 382fd9c774..3bb9238f66 100644
--- a/test/MUXControlsTestApp/MSTest/Package.appxmanifest
+++ b/test/MUXControlsTestApp/MSTest/Package.appxmanifest
@@ -1,6 +1,6 @@
-
+
MUXControlsTestApp
diff --git a/test/MUXControlsTestApp/MSTest/PackageInnerLoop.appxmanifest b/test/MUXControlsTestApp/MSTest/PackageInnerLoop.appxmanifest
index 55b4c0ca73..2ffafabfc6 100644
--- a/test/MUXControlsTestApp/MSTest/PackageInnerLoop.appxmanifest
+++ b/test/MUXControlsTestApp/MSTest/PackageInnerLoop.appxmanifest
@@ -1,6 +1,6 @@
-
+
MUXControlsInnerLoopTestApp
diff --git a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems
index 3f551d0bff..f917745fc1 100644
--- a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems
+++ b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems
@@ -29,7 +29,7 @@
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- $(MSBuildThisFileDirectory)\..\..\build\MSTest.pfx
+ $(MSBuildThisFileDirectory)\..\..\build\WinUITest.pfx
MUXControlsTestApp
true
@@ -143,7 +143,7 @@
-
+
diff --git a/test/MUXControlsTestApp/TAEF/Package.VS.appxmanifest b/test/MUXControlsTestApp/TAEF/Package.VS.appxmanifest
index 9a4712ac52..cfeae16b2d 100644
--- a/test/MUXControlsTestApp/TAEF/Package.VS.appxmanifest
+++ b/test/MUXControlsTestApp/TAEF/Package.VS.appxmanifest
@@ -1,6 +1,6 @@
-
+
MUXControlsTestApp
diff --git a/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj b/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj
index 97467f7edb..cea8b2c2e2 100644
--- a/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj
+++ b/test/MUXExperimentalTest/MUXExperimentalTestApp/MUXExperimentalTestApp.csproj
@@ -19,7 +19,7 @@
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
true
- ..\..\..\build\MSTest.pfx
+ ..\..\..\build\WinUITest.pfx
MUXExperimentalTestApp
False
False
@@ -112,7 +112,7 @@
Designer
-
+
diff --git a/test/MUXExperimentalTest/MUXExperimentalTestApp/Package.appxmanifest b/test/MUXExperimentalTest/MUXExperimentalTestApp/Package.appxmanifest
index 0687c62128..97045f7c20 100644
--- a/test/MUXExperimentalTest/MUXExperimentalTestApp/Package.appxmanifest
+++ b/test/MUXExperimentalTest/MUXExperimentalTestApp/Package.appxmanifest
@@ -1,6 +1,6 @@
-
+
MUXExperimentalTestApp
diff --git a/test/TestAppCX/Package.appxmanifest b/test/TestAppCX/Package.appxmanifest
index b1a9cd0009..3b4e60f2ee 100644
--- a/test/TestAppCX/Package.appxmanifest
+++ b/test/TestAppCX/Package.appxmanifest
@@ -1,6 +1,6 @@
-
+
TestAppCX
diff --git a/test/TestAppCX/TestAppCX.vcxproj b/test/TestAppCX/TestAppCX.vcxproj
index 7da59d0097..4edb0ec441 100644
--- a/test/TestAppCX/TestAppCX.vcxproj
+++ b/test/TestAppCX/TestAppCX.vcxproj
@@ -14,7 +14,7 @@
$(MuxSdkVersion)
10.0.15063.0
10.0
- ..\..\build\MSTest.pfx
+ ..\..\build\WinUITest.pfx
false
diff --git a/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs b/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs
index e58d4660af..f37fcc931f 100644
--- a/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs
+++ b/test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs
@@ -106,11 +106,11 @@ public static TestApplicationInfo MUXControlsTestApp
get
{
#if USING_TAEF
- string testAppName = "MUXControlsTestApp_8wekyb3d8bbwe!taef.executionengine.universal.App";
+ string testAppName = "MUXControlsTestApp_6f07fta6qpts2!taef.executionengine.universal.App";
#else
- string testAppName = "MUXControlsTestApp_8wekyb3d8bbwe!App";
+ string testAppName = "MUXControlsTestApp_6f07fta6qpts2!App";
#endif
- return new TestApplicationInfo("MUXControlsTestApp", testAppName, "MUXControlsTestApp_8wekyb3d8bbwe", MUXCertSerialNumber, MUXBaseAppxDir);
+ return new TestApplicationInfo("MUXControlsTestApp", testAppName, "MUXControlsTestApp_6f07fta6qpts2", MUXCertSerialNumber, MUXBaseAppxDir);
}
}
@@ -119,11 +119,11 @@ public static TestApplicationInfo MUXControlsInnerLoopTestApp
get
{
#if USING_TAEF
- string testAppName = "MUXControlsInnerLoopTestApp_8wekyb3d8bbwe!taef.executionengine.universal.App";
+ string testAppName = "MUXControlsInnerLoopTestApp_6f07fta6qpts2!taef.executionengine.universal.App";
#else
- string testAppName = "MUXControlsInnerLoopTestApp_8wekyb3d8bbwe!App";
+ string testAppName = "MUXControlsInnerLoopTestApp_6f07fta6qpts2!App";
#endif
- return new TestApplicationInfo("MUXControlsTestApp", testAppName, "MUXControlsInnerLoopTestApp_8wekyb3d8bbwe", "MUXControlsInnerLoopTestApp", "MUXControlsTestApp", "MUXControlsTestApp", MUXCertSerialNumber, MUXBaseAppxDir);
+ return new TestApplicationInfo("MUXControlsTestApp", testAppName, "MUXControlsInnerLoopTestApp_6f07fta6qpts2", "MUXControlsInnerLoopTestApp", "MUXControlsTestApp", "MUXControlsTestApp", MUXCertSerialNumber, MUXBaseAppxDir);
}
}
@@ -131,7 +131,7 @@ public static TestApplicationInfo NugetPackageTestApp
{
get
{
- return new TestApplicationInfo("NugetPackageTestApp", "NugetPackageTestApp_8wekyb3d8bbwe!App", "NugetPackageTestApp_8wekyb3d8bbwe", MUXCertSerialNumber, MUXBaseAppxDir);
+ return new TestApplicationInfo("NugetPackageTestApp", "NugetPackageTestApp_6f07fta6qpts2!App", "NugetPackageTestApp_6f07fta6qpts2", MUXCertSerialNumber, MUXBaseAppxDir);
}
}
@@ -139,7 +139,7 @@ public static TestApplicationInfo AppThatUsesMUXIndirectly
{
get
{
- return new TestApplicationInfo("AppThatUsesMUXIndirectly", "AppThatUsesMUXIndirectly_8wekyb3d8bbwe!App", "AppThatUsesMUXIndirectly_8wekyb3d8bbwe", MUXCertSerialNumber, MUXBaseAppxDir);
+ return new TestApplicationInfo("AppThatUsesMUXIndirectly", "AppThatUsesMUXIndirectly_6f07fta6qpts2!App", "AppThatUsesMUXIndirectly_6f07fta6qpts2", MUXCertSerialNumber, MUXBaseAppxDir);
}
}
@@ -147,7 +147,7 @@ public static TestApplicationInfo NugetPackageTestAppCX
{
get
{
- return new TestApplicationInfo("NugetPackageTestAppCX", "NugetPackageTestAppCX_8wekyb3d8bbwe!App", "NugetPackageTestAppCX_8wekyb3d8bbwe", MUXCertSerialNumber, MUXBaseAppxDir);
+ return new TestApplicationInfo("NugetPackageTestAppCX", "NugetPackageTestAppCX_6f07fta6qpts2!App", "NugetPackageTestAppCX_6f07fta6qpts2", MUXCertSerialNumber, MUXBaseAppxDir);
}
}
@@ -155,7 +155,7 @@ public static TestApplicationInfo XamlIslandsTestApp
{
get
{
- return new TestApplicationInfo("WpfApp", "WpfApp_8wekyb3d8bbwe!App", "WpfApp_8wekyb3d8bbwe", "WpfApp", "WpfApp.exe", "WpfApp", isUwpApp: false, MUXCertSerialNumber, MUXBaseAppxDir);
+ return new TestApplicationInfo("WpfApp", "WpfApp_6f07fta6qpts2!App", "WpfApp_6f07fta6qpts2", "WpfApp", "WpfApp.exe", "WpfApp", isUwpApp: false, MUXCertSerialNumber, MUXBaseAppxDir);
}
}
@@ -163,7 +163,7 @@ public static TestApplicationInfo XamlIslandsTestAppUnpackaged
{
get
{
- return new TestApplicationInfo("WpfApp_8wekyb3d8bbwe", "WpfApp", @"WpfApp\WpfApp.exe");
+ return new TestApplicationInfo("WpfApp_6f07fta6qpts2", "WpfApp", @"WpfApp\WpfApp.exe");
}
}
@@ -171,7 +171,7 @@ public static TestApplicationInfo MUXExperimentalTestApp
{
get
{
- return new TestApplicationInfo("MUXExperimentalTestApp", "MUXExperimentalTestApp_8wekyb3d8bbwe!App", "MUXExperimentalTestApp_8wekyb3d8bbwe", MUXCertSerialNumber, MUXBaseAppxDir);
+ return new TestApplicationInfo("MUXExperimentalTestApp", "MUXExperimentalTestApp_6f07fta6qpts2!App", "MUXExperimentalTestApp_6f07fta6qpts2", MUXCertSerialNumber, MUXBaseAppxDir);
}
}
}