Skip to content

Commit 614f9d2

Browse files
sreadingMSFTJohnMcPMSyao-msftashpatil-msftsachintaMSFT
authored
Add projected winrt wrapper for server com interface and add tests (#1373)
* Add c# in proc winrt wrapper and projection * Add wrapper implementation and project * Override factory to return objects. * Fix unreferenced parameters. * Guid name updates. * Undo unneccessary changes. * Remove projection. * Spelling changes. * Simplify packaged test csproj file. * Update guids\packagereference versions. * Remove anycpu * Append defines instead of overriding. * Attempt switch to packages.config for nuget * Add packagereference back. * Try packages.config again. * Try direct restore of csproj * Try workaround solutiondir issue * Try fix bundleplatforms. * Change outputpath * Remove output path * Make client and server have separate lib names. * Add output path back. * Merge build break fix to allow pipeline run. * Move test package to its own solution. * Microsoft.Management.Deployment.Client buildchange * Merge local master to comtesting (#16) * Fix bad merge (#1408) * Add support for rest api 1.1 interface (#1396) Added support for market Added support for source agreements Added support for msstore type Minor changes to workflow ui Next pr will be the manifest v1.1 integration. * Remove the packagedAPI experimental feature flag (#1419) * Integrating custom header with V1.1 changes (#1422) Integrating custom header with V1.1 changes * Expose pass through header through com interface. (#1420) * Add custom header. * Update behavior for composites. * Revert line ending changes. * Add comment. * Update composite behavior. * Fix error code * Update Loggers to support multiple Win32 app installs in single process (#1399) * Update Loggers to support multi threaded processing of Win32 app install requests in WPMServer Co-authored-by: JohnMcPMS <[email protected]> Co-authored-by: yao-msft <[email protected]> Co-authored-by: Ashwini Patil <[email protected]> Co-authored-by: sachintaMSFT <[email protected]> * Remove unneccessary cpp files * Run Com Interface tests * Add appxrecipe to spelling * Update test path * Update test paths. * Remove test adapter dll from testassembly * Add powershell task to install wingetdev * Add runsettings file to publish logs. * Test installing package in vstest * Try newer windows server. * Try enable com tracing for tests. * Try direct run of vstest * Fix install script to call add script. * Fix appxpackages path. * Fix path again, remove trace * Extract unsigned package for loose register * reenable tracing * Include server in packagedtests * Remove build dependency on wingetserver project * Try tracelog comtracing. * Fix powershell args. * Handle variable azure src dir paths. * Make Dll version of com server and use for tests * Fix library name parameter. * Remove com tracing. Fix test. * Fix copyright and spelling. * Try decrease build disk size. Co-authored-by: JohnMcPMS <[email protected]> Co-authored-by: yao-msft <[email protected]> Co-authored-by: Ashwini Patil <[email protected]> Co-authored-by: sachintaMSFT <[email protected]>
1 parent d46aea1 commit 614f9d2

File tree

57 files changed

+1681
-179
lines changed

Some content is hidden

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

57 files changed

+1681
-179
lines changed

.github/actions/spelling/allow.txt

+11
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ addmanifest
66
addstore
77
admins
88
alloc
9+
altform
910
anonymize
1011
api
12+
APIENTRY
1113
appdata
1214
appinst
1315
appinstaller
@@ -17,6 +19,7 @@ appx
1719
appxbundle
1820
appxbundles
1921
appxmanifest
22+
appxrecipe
2023
appxsdk
2124
APSTUDIO
2225
argc
@@ -105,6 +108,7 @@ DIRECTONLY
105108
distro
106109
dll
107110
dllexport
111+
dllmain
108112
docx
109113
dotnet
110114
downlevel
@@ -132,6 +136,7 @@ EULA
132136
EVENTTAG
133137
exe
134138
executables
139+
executionengine
135140
exeenus
136141
exeinteractive
137142
exelog
@@ -185,6 +190,7 @@ html
185190
http
186191
https
187192
Hyperlink
193+
IActivation
188194
IApplication
189195
IAppx
190196
IAsync
@@ -337,6 +343,7 @@ PBYTE
337343
pch
338344
PCWSTR
339345
pdb
346+
pdbonly
340347
PEVENT
341348
pfp
342349
PGP
@@ -489,6 +496,7 @@ TARG
489496
TARGETDIR
490497
targetentrypoint
491498
targetnametoken
499+
targetsize
492500
tdbuild
493501
tdd
494502
tellg
@@ -505,13 +513,15 @@ Timeline
505513
todo
506514
tokenizer
507515
tolower
516+
Toolchain
508517
toupper
509518
TOutput
510519
towlower
511520
TRACELOGGING
512521
triaged
513522
trunc
514523
TRUSTEDPEOPLE
524+
trx
515525
tt
516526
ttl
517527
typedef
@@ -578,6 +588,7 @@ wcsicmp
578588
webpage
579589
wekyb
580590
wil
591+
wildcards
581592
WINAPI
582593
WINEVENT
583594
winget

.github/actions/spelling/expect.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
abcd
2+
activatable
23
adml
34
admx
45
affle
@@ -79,6 +80,7 @@ count'th
7980
countof
8081
countryregion
8182
createmanifestmetadata
83+
CSharp
8284
cstdint
8385
ctc
8486
Ctx
@@ -161,6 +163,7 @@ insufficientmemory
161163
Intelli
162164
IPackage
163165
IPersist
166+
IRead
164167
IService
165168
ISettings
166169
ishelp
@@ -230,6 +233,8 @@ myinstalldir
230233
mylog
231234
mysilent
232235
mysilentwithprogress
236+
mytool
237+
NETFX
233238
netlify
234239
Newtonsoft
235240
NOEXPAND
@@ -364,6 +369,7 @@ VERSI
364369
VERSIE
365370
vns
366371
vscode
372+
vstest
367373
vy
368374
wcslen
369375
webpages

azure-pipelines.yml

+30
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ variables:
1919
solution: 'src/AppInstallerCLI.sln'
2020
buildPlatform: 'x86|x64'
2121
buildConfiguration: 'Release'
22+
testBuildPlatform: 'x86'
23+
testBuildConfiguration: 'TestRelease'
2224
appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\'
2325

2426
# Do not set the build version for a PR build.
@@ -65,6 +67,11 @@ jobs:
6567
displayName: Restore AppInstallerTestMsixInstaller
6668
inputs:
6769
restoreSolution: 'src\AppInstallerTestMsixInstaller\AppInstallerTestMsixInstaller.wapproj'
70+
71+
- task: NuGetCommand@2
72+
displayName: Restore PackagedTests
73+
inputs:
74+
restoreSolution: 'src\PackagedTests\PackagedTests.csproj'
6875

6976
# Restores only .NET core projects, but is still necessary, as without this the IndexCreationTool and LocalhostWebServer projects fail to build
7077
- task: DotNetCoreCLI@2
@@ -81,6 +88,7 @@ jobs:
8188
arguments: '-TargetFile binver\binver\version.h -BuildVersion $(BuildVer)'
8289
workingDirectory: 'src'
8390

91+
# Build all solutions in the root directory.
8492
- task: VSBuild@1
8593
displayName: Build Solution
8694
inputs:
@@ -92,6 +100,17 @@ jobs:
92100
/p:AppxBundle=Always
93101
/p:UapAppxPackageBuildMode=StoreUpload'
94102

103+
- task: VSBuild@1
104+
displayName: Build Test Project
105+
inputs:
106+
platform: 'x86'
107+
solution: '$(solution)'
108+
configuration: '$(testBuildConfiguration)'
109+
msbuildArgs: '/p:AppxBundlePlatforms="$(testBuildPlatform)"
110+
/p:AppxPackageDir="$(appxPackageDir)"
111+
/p:AppxBundle=Always
112+
/p:UapAppxPackageBuildMode=StoreUpload'
113+
95114
- task: PowerShell@2
96115
displayName: Install Tests Dependencies
97116
inputs:
@@ -302,6 +321,17 @@ jobs:
302321
publishLocation: 'Container'
303322
condition: succeededOrFailed()
304323

324+
- task: VSTest@2
325+
displayName: Run Com Interface Tests
326+
inputs:
327+
testRunTitle: 'Com Interface Tests'
328+
platform: 'x86'
329+
testSelector: 'testAssemblies'
330+
testAssemblyVer2: |
331+
src\x86\Release\PackagedTests\PackagedTests.build.appxrecipe
332+
runSettingsFile: 'src\x86\Release\PackagedTests\Test.runsettings'
333+
condition: succeededOrFailed()
334+
305335
- task: PublishBuildArtifacts@1
306336
displayName: Publish CLI Binary
307337
inputs:

0 commit comments

Comments
 (0)