Skip to content

Commit

Permalink
Added test Singleton MSIX package (#1194)
Browse files Browse the repository at this point in the history
* Added test Singleton MSIX package

* Added WARsingleton test project

* Added ARM64 support (oops :-)
  • Loading branch information
DrusTheAxe authored Aug 10, 2021
1 parent 5f41f5f commit 8611cc2
Show file tree
Hide file tree
Showing 13 changed files with 423 additions and 26 deletions.
43 changes: 29 additions & 14 deletions WindowsAppSDK.sln
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PowerNotifications", "Power
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerNotifications", "dev\PowerNotifications\PowerNotifications.vcxitems", "{B75C1B22-553C-40E4-B38E-6AB4D01FDB9D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerNotifications", "test\PowerNotifications\PowerNotifications.vcxproj", "{A9D7357B-FA9A-4548-B21E-F305DD63BC68}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerNotifications", "test\PowerNotifications\PowerNotifications.vcxproj", "{CBD95746-61CE-4F31-B6CC-C5ABF1766180}"
EndProject
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}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Expand Down Expand Up @@ -595,18 +597,30 @@ Global
{C422B090-F501-4204-8068-1084B0799405}.Release|x64.Build.0 = Release|x64
{C422B090-F501-4204-8068-1084B0799405}.Release|x86.ActiveCfg = Release|Win32
{C422B090-F501-4204-8068-1084B0799405}.Release|x86.Build.0 = Release|Win32
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|Any CPU.ActiveCfg = Debug|Win32
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|ARM64.ActiveCfg = Debug|Win32
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|x64.ActiveCfg = Debug|x64
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|x64.Build.0 = Debug|x64
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|x86.ActiveCfg = Debug|Win32
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Debug|x86.Build.0 = Debug|Win32
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|Any CPU.ActiveCfg = Release|Win32
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|ARM64.ActiveCfg = Release|Win32
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|x64.ActiveCfg = Release|x64
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|x64.Build.0 = Release|x64
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|x86.ActiveCfg = Release|Win32
{A9D7357B-FA9A-4548-B21E-F305DD63BC68}.Release|x86.Build.0 = Release|Win32
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|Any CPU.ActiveCfg = Debug|Win32
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|ARM64.ActiveCfg = Debug|Win32
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|x64.ActiveCfg = Debug|x64
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|x64.Build.0 = Debug|x64
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|x86.ActiveCfg = Debug|Win32
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Debug|x86.Build.0 = Debug|Win32
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|Any CPU.ActiveCfg = Release|Win32
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|ARM64.ActiveCfg = Release|Win32
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|x64.ActiveCfg = Release|x64
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|x64.Build.0 = Release|x64
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|x86.ActiveCfg = Release|Win32
{CBD95746-61CE-4F31-B6CC-C5ABF1766180}.Release|x86.Build.0 = Release|Win32
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|Any CPU.ActiveCfg = Debug|Win32
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|ARM64.ActiveCfg = Debug|Win32
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|x64.ActiveCfg = Debug|x64
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|x64.Build.0 = Debug|x64
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|x86.ActiveCfg = Debug|Win32
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Debug|x86.Build.0 = Debug|Win32
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|Any CPU.ActiveCfg = Release|Win32
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|ARM64.ActiveCfg = Release|Win32
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|x64.ActiveCfg = Release|x64
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|x64.Build.0 = Release|x64
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|x86.ActiveCfg = Release|Win32
{8F2C21F1-47AB-428C-A110-EE33FD7D9493}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -658,7 +672,8 @@ Global
{C422B090-F501-4204-8068-1084B0799405} = {A1B25DCF-6A54-414D-8E24-F4D24EE9299D}
{E9117D76-63AC-4289-A628-AB39EF6E5D19} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{B75C1B22-553C-40E4-B38E-6AB4D01FDB9D} = {E9117D76-63AC-4289-A628-AB39EF6E5D19}
{A9D7357B-FA9A-4548-B21E-F305DD63BC68} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
{CBD95746-61CE-4F31-B6CC-C5ABF1766180} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
{8F2C21F1-47AB-428C-A110-EE33FD7D9493} = {0C534F12-B076-47E5-A05B-2A711233AC6F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See LICENSE in the project root for license information.

#!include <WindowsAppSDK.Tools.MakeMsix.mak>

MAKEAPPX_OPTS=
!IFDEF VERBOSE
MAKEAPPX_OPTS=/v
!ENDIF

SIGNTOOL_OPTS=
!IFDEF VERBOSE
SIGNTOOL_OPTS=/v
!ENDIF

!IFDEF VERBOSE
!MESSAGE SolutionDir =$(SolutionDir)
!MESSAGE ProjectDir =$(ProjectDir)
!MESSAGE OutDir =$(OutDir)
!MESSAGE TargetName =$(TargetName)
!MESSAGE WindowsAppSdkBuildPipeline =$(WindowsAppSdkBuildPipeline)
!ENDIF

TARGET_BASENAME=DynamicDependency.DataStore

TARGET_EXE=$(TARGET_BASENAME)
TARGET_EXE_DIR=$(OutDir)$(TARGET_EXE)
TARGET_EXE_FILE=$(TARGET_EXE_DIR)\$(TARGET_EXE).exe

TARGET_PROXYSTUB=$(TARGET_BASENAME).ProxyStub
TARGET_PROXYSTUB_DIR=$(OutDir)$(TARGET_PROXYSTUB)
TARGET_PROXYSTUB_FILE=$(TARGET_PROXYSTUB_DIR)\$(TARGET_PROXYSTUB).dll
!IFDEF VERBOSE
!MESSAGE $(TARGET_PROXYSTUB_FILE)
!ENDIF

TargetDir=$(OutDir)$(TargetName)
WorkDir=$(TargetDir)\msix
OutMsix=$(TargetDir)\$(TargetName)

!IFDEF VERBOSE
!MESSAGE Workdir =$(WorkDir)
!MESSAGE OutMsix =$(OutMsix)
!ENDIF

all: build

$(OutMsix): $(ProjectDir)appxmanifest.xml
@if not exist $(WorkDir) md $(WorkDir)
@copy /Y $(ProjectDir)appxmanifest.xml $(WorkDir)\appxmanifest.xml
@if not exist $(WorkDir)\Assets md $(WorkDir)\Assets >NUL
@copy /Y $(ProjectDir)Assets\* $(WorkDir)\Assets\* >NUL
REM @copy /Y $(TARGET_EXE_FILE) $(WorkDir) >NUL
REM @copy /Y $(TARGET_PROXYSTUB_FILE) $(WorkDir) >NUL
@makeappx.exe pack $(MAKEAPPX_OPTS) /o /h SHA256 /d $(WorkDir) /p $(OutMsix)
@signtool.exe sign /a $(SIGNTOOL_OPTS) /fd SHA256 /f $(SolutionDir)temp\MSTest.pfx $(OutMsix)

build: $(OutMsix)

clean:
@if exist $(WorkDir) rd $(WorkDir) /s /q
@if exist $(OutMsix) del $(OutMsix)
@if exist $(TARGET_BASENAME).*.msix del $(TARGET_BASENAME).*.msix

rebuild: clean build
Loading

0 comments on commit 8611cc2

Please sign in to comment.