Try #2

realm · May 27, 2021 · bac5594 · bac5594
1 parent fd7f8de
commit bac5594
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -375,7 +375,7 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
     - name: Build Tests/Tests.UWP
-      run: msbuild Tests/Tests.UWP -p:Configuration=Release -restore -p:RestoreConfigFile=Tests/Test.NuGet.Config -p:UseRealmNupkgsWithVersion=${{ needs.build-packages.outputs.package_version }} -p:AppxBundlePlatforms=x64 -p:Platform=x64
+      run: msbuild Tests/Tests.UWP -p:Configuration=Release -restore -p:UseRealmNupkgsWithVersion=${{ needs.build-packages.outputs.package_version }} -p:AppxBundle=Always -p:PackageCertificatePassword=Realm123 -p:UseDotNetNativeToolchain=false
     - name: Install the UWP test app
       run: |
         Import-Module Appx -usewindowspowershell

diff --git a/Tests/Tests.UWP/Package.appxmanifest b/Tests/Tests.UWP/Package.appxmanifest
@@ -9,7 +9,7 @@
 
   <Identity
     Name="realm.uwp.tests"
-    Publisher="CN=andrea"
+    Publisher="CN=Realm Tests"
     Version="1.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="032e482b-1a73-46f2-afb7-1c22f2e68be8" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

diff --git a/Tests/Tests.UWP/Tests.UWP.csproj b/Tests/Tests.UWP/Tests.UWP.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{7EFF9E5C-5E74-469B-8DB7-C25C9AF0444E}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -22,12 +22,13 @@
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x86|x64|ARM</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <PackageCertificateThumbprint>
-    </PackageCertificateThumbprint>
-    <PackageCertificateKeyFile>Tests.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <PackageCertificateKeyFile>Tests.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(UseRealmNupkgsWithVersion)' != ''">
+    <RestoreConfigFile>..\Test.NuGet.Config</RestoreConfigFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
     <StartArguments>--headless --labels=After</StartArguments>

diff --git a/Tests/Tests.UWP/Tests.UWP_TemporaryKey.pfx b/Tests/Tests.UWP/Tests.UWP_TemporaryKey.pfx