Skip to content

Commit

Permalink
Introduce Managed Interop and merged manifest classes to WingetUtil n…
Browse files Browse the repository at this point in the history
…uget (#1621)

* Add new interop dll and update nuspec/targets

* Add tests. Update Nuget Publish pipeline.

* Fix typos

* update word list

* PR Comments

* Correct path in build.

* Fix folder path
  • Loading branch information
jamespik committed Oct 25, 2021
1 parent 17fc527 commit 33bc04e
Show file tree
Hide file tree
Showing 41 changed files with 3,537 additions and 0 deletions.
21 changes: 21 additions & 0 deletions .github/actions/spelling/allow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ argc
args
argv
ARRAYSIZE
artifactstagingdirectory
aspirational
aspnet
authn
Expand Down Expand Up @@ -66,6 +67,8 @@ conemu
config
Configurability
constexpr
contosa
contosainstaller
Contoso
copyable
COSTDEFERRED
Expand Down Expand Up @@ -98,6 +101,7 @@ Demitrius
denelon
depersist
deque
deserialize
Deserialize
deserializer
deserializing
Expand All @@ -109,6 +113,7 @@ distro
dll
dllexport
dllmain
Dlls
docx
dotnet
downlevel
Expand All @@ -131,6 +136,8 @@ errorlevel
errstr
esrp
etag
etcoreapp
etstandard
ETW
EULA
EVENTTAG
Expand All @@ -149,6 +156,7 @@ EXTRAFLAGS
FAILIFTHERE
fakeswitch
FATALEXIT
FEBAB
FIELDTAG
FILEFLAGS
FILEFLAGSMASK
Expand Down Expand Up @@ -196,9 +204,12 @@ IAppx
IAsync
IBuffer
icu
IDeserializer
IDisposable
IDX
IEnumerable
IEquatable
IEquitable
IFACEMETHOD
ifdef
ifndef
Expand All @@ -207,8 +218,10 @@ IInput
IInspectable
IIS
ILogger
IManifest
impl
Inet
inheritdoc
inno
INotify
INPROC
Expand All @@ -230,10 +243,12 @@ IProgress
IRandom
IRest
ISAPPROVEDFOROUTPUT
ISet
ISource
isspace
istream
istringstream
ITest
IUnknown
json
junit
Expand Down Expand Up @@ -274,6 +289,7 @@ Minimatch
MINORVERSION
mkdir
monostate
Moq
motw
mrm
msbuild
Expand All @@ -284,6 +300,7 @@ msiexec
msix
msixbundle
msixinfo
msixmgr
msixsdk
msixsdkx
msixtest
Expand All @@ -296,6 +313,7 @@ namespace
namespaces
Nelon
netcoreapp
netstandard
newid
NOCLOSEPROCESS
nodiscard
Expand Down Expand Up @@ -471,6 +489,7 @@ stoll
storeedgefd
storepreview
stoull
stpkgmanvalwestustest
strcoll
streamoff
streampos
Expand Down Expand Up @@ -551,6 +570,7 @@ UNICODESTRING
uninstall
uninstalling
Unregister
untimes
updatemanifest
UPLEVEL
upvote
Expand Down Expand Up @@ -622,6 +642,7 @@ XName
XResource
xsd
XTOKEN
xunit
yaml
yml
yy
Expand Down
8 changes: 8 additions & 0 deletions WinGetUtil.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,20 @@
<description>The utility binary for use with the WinGet CLI.</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>winget</tags>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="YamlDotNet" version="8.1.2" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="src\x64\Release\WinGetUtil\WinGetUtil.dll" target="runtimes\win-x64\native\WinGetUtil.dll"/>
<file src="src\x64\Release\WinGetUtil\WinGetUtil.pdb" target="runtimes\win-x64\native\WinGetUtil.pdb"/>
<file src="src\x86\Release\WinGetUtil\WinGetUtil.dll" target="runtimes\win-x86\native\WinGetUtil.dll"/>
<file src="src\x86\Release\WinGetUtil\WinGetUtil.pdb" target="runtimes\win-x86\native\WinGetUtil.pdb"/>
<file src="schemas\JSON\manifests\**" target="content\schemas\JSON\manifests" />
<file src="src\WinGetUtilInterop\bin\Release\netstandard2.0\WinGetUtilInterop.dll" target="lib/netstandard2.0/WinGetUtilInterop.dll" />
<file src="src\WinGetUtilInterop\bin\Release\netstandard2.0\WinGetUtilInterop.pdb" target="lib/netstandard2.0/WinGetUtilInterop.pdb" />
<file src="src\WinGetUtilInterop\build\Microsoft.WindowsPackageManager.Utils.targets" target="build/Microsoft.WindowsPackageManager.Utils.targets" />
</files>
</package>
1 change: 1 addition & 0 deletions azure-pipelines.nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ jobs:
FolderPath: src
Pattern: |
*\$(buildConfiguration)\WinGetUtil\WinGetUtil.dll
WinGetUtilInterop\bin\$(buildConfiguration)\netstandard2.0\WinGetUtilInterop.dll
UseMinimatch: true
signConfigType: inlineSignParams
inlineOperation: |
Expand Down
20 changes: 20 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,26 @@ jobs:
runSettingsFile: 'src\x86\Release\PackagedTests\Test.runsettings'
condition: succeededOrFailed()

- task: CopyFiles@2
displayName: 'Copy Files: WinGetUtilInterop.UnitTests'
inputs:
SourceFolder: '$(Build.SourcesDirectory)\src\WinGetUtilInterop.UnitTests\bin\$(BuildConfiguration)\netcoreapp3.1'
TargetFolder: '$(build.artifactstagingdirectory)\WinGetUtilInterop.UnitTests\'
CleanTargetFolder: true
OverWrite: true
condition: succeededOrFailed()

- task: VSTest@2
displayName: 'Run tests: WinGetUtilInterop.UnitTests'
inputs:
testSelector: 'testAssemblies'
testAssemblyVer2: 'WinGetUtilInterop.UnitTests.dll'
searchFolder: '$(build.artifactstagingdirectory)\WinGetUtilInterop.UnitTests'
codeCoverageEnabled: true
platform: 'Any CPU'
configuration: '$(BuildConfiguration)'
condition: succeededOrFailed()

- task: PublishBuildArtifacts@1
displayName: Publish CLI Binary
inputs:
Expand Down
Loading

0 comments on commit 33bc04e

Please sign in to comment.