Skip to content

Commit 8611cc2

Browse files
DrusTheAxeDrusTheAxe
authored
Added test Singleton MSIX package (#1194)
* Added test Singleton MSIX package * Added WARsingleton test project * Added ARM64 support (oops :-)
1 parent 5f41f5f commit 8611cc2

13 files changed

Lines changed: 423 additions & 26 deletions

‎WindowsAppSDK.sln‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PowerNotifications", "Power
169169
EndProject
170170
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerNotifications", "dev\PowerNotifications\PowerNotifications.vcxitems", "{B75C1B22-553C-40E4-B38E-6AB4D01FDB9D}"
171171
EndProject
172-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerNotifications", "test\PowerNotifications\PowerNotifications.vcxproj", "{A9D7357B-FA9A-4548-B21E-F305DD63BC68}"
172+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerNotifications", "test\PowerNotifications\PowerNotifications.vcxproj", "{CBD95746-61CE-4F31-B6CC-C5ABF1766180}"
173+
EndProject
174+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsAppSDK.Test.Singleton.Msix", "test\DynamicDependency\data\WindowsAppSDK.Test.Singleton.Msix\WindowsAppSDK.Test.Singleton.Msix.vcxproj", "{8F2C21F1-47AB-428C-A110-EE33FD7D9493}"
173175
EndProject
174176
Global
175177
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -595,18 +597,30 @@ Global
595597
{C422B090-F501-4204-8068-1084B0799405}.Release|x64.Build.0 = Release|x64
596598
{C422B090-F501-4204-8068-1084B0799405}.Release|x86.ActiveCfg = Release|Win32
597599
{C422B090-F501-4204-8068-1084B0799405}.Release|x86.Build.0 = Release|Win32
598-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|Any CPU.ActiveCfg = Debug|Win32
599-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|ARM64.ActiveCfg = Debug|Win32
600-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|x64.ActiveCfg = Debug|x64
601-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|x64.Build.0 = Debug|x64
602-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|x86.ActiveCfg = Debug|Win32
603-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|x86.Build.0 = Debug|Win32
604-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|Any CPU.ActiveCfg = Release|Win32
605-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|ARM64.ActiveCfg = Release|Win32
606-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|x64.ActiveCfg = Release|x64
607-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|x64.Build.0 = Release|x64
608-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|x86.ActiveCfg = Release|Win32
609-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|x86.Build.0 = Release|Win32
600+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|Any CPU.ActiveCfg = Debug|Win32
601+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|ARM64.ActiveCfg = Debug|Win32
602+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|x64.ActiveCfg = Debug|x64
603+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|x64.Build.0 = Debug|x64
604+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|x86.ActiveCfg = Debug|Win32
605+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|x86.Build.0 = Debug|Win32
606+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|Any CPU.ActiveCfg = Release|Win32
607+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|ARM64.ActiveCfg = Release|Win32
608+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|x64.ActiveCfg = Release|x64
609+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|x64.Build.0 = Release|x64
610+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|x86.ActiveCfg = Release|Win32
611+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|x86.Build.0 = Release|Win32
612+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|Any CPU.ActiveCfg = Debug|Win32
613+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|ARM64.ActiveCfg = Debug|Win32
614+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|x64.ActiveCfg = Debug|x64
615+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|x64.Build.0 = Debug|x64
616+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|x86.ActiveCfg = Debug|Win32
617+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|x86.Build.0 = Debug|Win32
618+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|Any CPU.ActiveCfg = Release|Win32
619+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|ARM64.ActiveCfg = Release|Win32
620+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|x64.ActiveCfg = Release|x64
621+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|x64.Build.0 = Release|x64
622+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|x86.ActiveCfg = Release|Win32
623+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|x86.Build.0 = Release|Win32
610624
EndGlobalSection
611625
GlobalSection(SolutionProperties) = preSolution
612626
HideSolutionNode = FALSE
@@ -658,7 +672,8 @@ Global
658672
{C422B090-F501-4204-8068-1084B0799405} = {A1B25DCF-6A54-414D-8E24-F4D24EE9299D}
659673
{E9117D76-63AC-4289-A628-AB39EF6E5D19} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
660674
{B75C1B22-553C-40E4-B38E-6AB4D01FDB9D} = {E9117D76-63AC-4289-A628-AB39EF6E5D19}
661-
{A9D7357B-FA9A-4548-B21E-F305DD63BC68} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
675+
{CBD95746-61CE-4F31-B6CC-C5ABF1766180} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
676+
{8F2C21F1-47AB-428C-A110-EE33FD7D9493} = {0C534F12-B076-47E5-A05B-2A711233AC6F}
662677
EndGlobalSection
663678
GlobalSection(ExtensibilityGlobals) = postSolution
664679
SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}

‎test/DynamicDependency/data/WindowsAppSDK.Test.Singleton.Msix/Assets/SplashScreen.png‎

91.2 KB
Loading

‎test/DynamicDependency/data/WindowsAppSDK.Test.Singleton.Msix/Assets/Square150x150Logo.png‎

11.4 KB
Loading

‎test/DynamicDependency/data/WindowsAppSDK.Test.Singleton.Msix/Assets/Square44x44Logo.png‎

3.91 KB
Loading

‎test/DynamicDependency/data/WindowsAppSDK.Test.Singleton.Msix/Assets/Wide310x150Logo.png‎

11.8 KB
Loading

‎test/DynamicDependency/data/WindowsAppSDK.Test.Singleton.Msix/Assets/logo.png‎

4.33 KB
Loading

‎test/DynamicDependency/data/WindowsAppSDK.Test.Singleton.Msix/Makefile.mak‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License. See LICENSE in the project root for license information.
3+
4+
#!include <WindowsAppSDK.Tools.MakeMsix.mak>
5+
6+
MAKEAPPX_OPTS=
7+
!IFDEF VERBOSE
8+
MAKEAPPX_OPTS=/v
9+
!ENDIF
10+
11+
SIGNTOOL_OPTS=
12+
!IFDEF VERBOSE
13+
SIGNTOOL_OPTS=/v
14+
!ENDIF
15+
16+
!IFDEF VERBOSE
17+
!MESSAGE SolutionDir =$(SolutionDir)
18+
!MESSAGE ProjectDir =$(ProjectDir)
19+
!MESSAGE OutDir =$(OutDir)
20+
!MESSAGE TargetName =$(TargetName)
21+
!MESSAGE WindowsAppSdkBuildPipeline =$(WindowsAppSdkBuildPipeline)
22+
!ENDIF
23+
24+
TARGET_BASENAME=DynamicDependency.DataStore
25+
26+
TARGET_EXE=$(TARGET_BASENAME)
27+
TARGET_EXE_DIR=$(OutDir)$(TARGET_EXE)
28+
TARGET_EXE_FILE=$(TARGET_EXE_DIR)\$(TARGET_EXE).exe
29+
30+
TARGET_PROXYSTUB=$(TARGET_BASENAME).ProxyStub
31+
TARGET_PROXYSTUB_DIR=$(OutDir)$(TARGET_PROXYSTUB)
32+
TARGET_PROXYSTUB_FILE=$(TARGET_PROXYSTUB_DIR)\$(TARGET_PROXYSTUB).dll
33+
!IFDEF VERBOSE
34+
!MESSAGE $(TARGET_PROXYSTUB_FILE)
35+
!ENDIF
36+
37+
TargetDir=$(OutDir)$(TargetName)
38+
WorkDir=$(TargetDir)\msix
39+
OutMsix=$(TargetDir)\$(TargetName)
40+
41+
!IFDEF VERBOSE
42+
!MESSAGE Workdir =$(WorkDir)
43+
!MESSAGE OutMsix =$(OutMsix)
44+
!ENDIF
45+
46+
all: build
47+
48+
$(OutMsix): $(ProjectDir)appxmanifest.xml
49+
@if not exist $(WorkDir) md $(WorkDir)
50+
@copy /Y $(ProjectDir)appxmanifest.xml $(WorkDir)\appxmanifest.xml
51+
@if not exist $(WorkDir)\Assets md $(WorkDir)\Assets >NUL
52+
@copy /Y $(ProjectDir)Assets\* $(WorkDir)\Assets\* >NUL
53+
REM @copy /Y $(TARGET_EXE_FILE) $(WorkDir) >NUL
54+
REM @copy /Y $(TARGET_PROXYSTUB_FILE) $(WorkDir) >NUL
55+
@makeappx.exe pack $(MAKEAPPX_OPTS) /o /h SHA256 /d $(WorkDir) /p $(OutMsix)
56+
@signtool.exe sign /a $(SIGNTOOL_OPTS) /fd SHA256 /f $(SolutionDir)temp\MSTest.pfx $(OutMsix)
57+
58+
build: $(OutMsix)
59+
60+
clean:
61+
@if exist $(WorkDir) rd $(WorkDir) /s /q
62+
@if exist $(OutMsix) del $(OutMsix)
63+
@if exist $(TARGET_BASENAME).*.msix del $(TARGET_BASENAME).*.msix
64+
65+
rebuild: clean build

0 commit comments

Comments
 (0)