Skip to content

Commit fdbbcaa

Browse files
guimafelipessparach
guimafelipe
and
ssparach
authored
Enabling deployment tests (#5792)
* fix packageFamilyName * fix format * Enabling deployment tests * Update DeploymentManager.cpp address PR comments * Fixing packages names * Deploying agent with package * Fixing framework package name * Fixing framework package name in all tests * Fixing applifecycle test app bootstrap initialization * Cleanup code --------- Co-authored-by: ssparach <[email protected]>
1 parent 80c2c38 commit fdbbcaa

42 files changed

Lines changed: 69 additions & 53 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎test/AppNotificationTests/AppNotifications-AppxManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<Dependencies>
2626
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.0.0" MaxVersionTested="12.0.0.0" />
27-
<PackageDependency Name="Microsoft.WindowsAppRuntime.Framework.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
27+
<PackageDependency Name="Microsoft.WindowsAppRuntime.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
2828
</Dependencies>
2929

3030
<Resources>

‎test/BackgroundTaskTests/BackgroundTaskBuilder-AppxManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<Dependencies>
2323
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
24-
<PackageDependency Name="Microsoft.WindowsAppRuntime.Framework.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
24+
<PackageDependency Name="Microsoft.WindowsAppRuntime.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
2525
</Dependencies>
2626

2727
<Resources>

‎test/BadgeNotificationTest/BadgeNotifications-AppxManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<Dependencies>
2626
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.0.0" MaxVersionTested="12.0.0.0" />
27-
<PackageDependency Name="Microsoft.WindowsAppRuntime.Framework.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
27+
<PackageDependency Name="Microsoft.WindowsAppRuntime.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
2828
</Dependencies>
2929

3030
<Resources>

‎test/CameraCaptureUITests/CameraCaptureUI-AppxManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<Dependencies>
2323
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
24-
<PackageDependency Name="Microsoft.WindowsAppRuntime.Framework.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
24+
<PackageDependency Name="Microsoft.WindowsAppRuntime.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
2525
</Dependencies>
2626

2727
<Resources>

‎test/Deployment/API/Deployment-Capabilities-AppxManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22

33
<Package
44
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
@@ -46,7 +46,6 @@
4646

4747
<Capabilities>
4848
<rescap:Capability Name="packageManagement" />
49-
<rescap:Capability Name="packageQuery" />
5049
<rescap:Capability Name="runFullTrust" />
5150
</Capabilities>
5251
</Package>

‎test/Deployment/API/Deployment-RealNameFramework-AppxManifest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22

33
<Package
44
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
@@ -21,7 +21,7 @@
2121

2222
<Dependencies>
2323
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
24-
<PackageDependency Name="Microsoft.WindowsAppRuntime.Framework.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
24+
<PackageDependency Name="Microsoft.WindowsAppRuntime.4.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" MinVersion="0.0.0.0"/>
2525
</Dependencies>
2626

2727
<Resources>
@@ -46,7 +46,6 @@
4646

4747
<Capabilities>
4848
<rescap:Capability Name="packageManagement" />
49-
<rescap:Capability Name="packageQuery" />
5049
<rescap:Capability Name="runFullTrust" />
5150
</Capabilities>
5251
</Package>

‎test/Deployment/API/DeploymentTests.testdef‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"Tests": [
3+
{
4+
"Description": "Deployment Tests",
5+
"Filename": "DeploymentTests.dll",
6+
"Parameters": "",
7+
"Architectures": ["x64", "x86", "arm64"],
8+
"Status": "Enabled"
9+
}
10+
]
11+
}

‎test/Deployment/API/DeploymentTests.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@
234234
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets')" />
235235
<Import Project="$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
236236
</ImportGroup>
237+
<Target Name="CopyFiles" AfterTargets="Build">
238+
<Copy SkipUnchangedFiles="true" SourceFiles="DeploymentTests.testdef" DestinationFolder="$(OutDir)" />
239+
</Target>
237240
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
238241
<PropertyGroup>
239242
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

‎test/Deployment/data/WindowsAppRuntime.Test.Framework/WindowsAppRuntime.Test.Framework.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
<MakeMsixInputs Include="$(OutDir)..\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.dll"/>
112112
<MakeMsixInputs Include="$(OutDir)..\WindowsAppRuntime_DLL\Microsoft.WindowsAppRuntime.pdb" />
113113
<MakeMsixInputs Include="$(OutDir)..\WindowsAppRuntime_DLL\Microsoft.Internal.FrameworkUdk.dll" />
114+
<MakeMsixInputs Include="$(OutDir)..\DeploymentAgent\DeploymentAgent.exe" />
114115
<MakeMsixInputsWithLocations Include="$(OutDir)..\Deployment.WindowsAppRuntime.Test.Main\Deployment.WindowsAppRuntime.Test.Main.msix">
115116
<TargetFile>MSIX\Main.msix</TargetFile>
116117
</MakeMsixInputsWithLocations>
@@ -130,6 +131,9 @@
130131
<ProjectReference Include="$(RepoRoot)\dev\WindowsAppRuntime_DLL\WindowsAppRuntime_DLL.vcxproj">
131132
<Project>{b73ad907-6164-4294-88fb-f3c9c10da1f1}</Project>
132133
</ProjectReference>
134+
<ProjectReference Include="$(RepoRoot)\dev\DeploymentAgent\DeploymentAgent.vcxproj">
135+
<Project>{4410d374-a90c-4adf-8b15-aa2aae2636bf}</Project>
136+
</ProjectReference>
133137
<ProjectReference Include="..\WindowsAppRuntime.Test.Main\WindowsAppRuntime.Test.Main.vcxproj">
134138
<Project>{34519337-9249-451e-b5a9-1ecacf9c3da8}</Project>
135139
</ProjectReference>

‎test/Deployment/data/WindowsAppRuntime.Test.Main/appxmanifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22

33
<Package
44
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
@@ -10,12 +10,12 @@
1010
IgnorableNamespaces="uap uap3 uap5 com rescap">
1111

1212
<Identity
13-
Name="Microsoft.WindowsAppRuntime.Main.1.0-Test"
13+
Name="MicrosoftCorporationII.WinAppRuntime.Main.1.0-T"
1414
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
1515
Version="4.1.1967.333" />
1616

1717
<Properties>
18-
<DisplayName>Microsoft.WindowsAppRuntime.Main.Test (aka Microsoft.WindowsAppRuntime.Main) fake for tests</DisplayName>
18+
<DisplayName>MicrosoftCorporationII.WinAppRuntime.Main.Test (aka Microsoft.WindowsAppRuntime.Main) fake for tests</DisplayName>
1919
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
2020
<Logo>Assets\logo.png</Logo>
2121
</Properties>

0 commit comments

Comments
 (0)