Skip to content

Commit

Permalink
Retarget to netstandard2.1 (microsoft#4130) (microsoft#4132)
Browse files Browse the repository at this point in the history
Cherry-pick microsoft#4130 to master

Fix nuget pipeline for correct net standard version. 

###### Microsoft Reviewers: [Open in
CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/4132)
  • Loading branch information
msftrubengu authored Feb 1, 2024
1 parent 3bcd69d commit e577218
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions WinGetUtil.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<file src="Build.x86release\src\x86\Release\WinGetUtil\WinGetUtil.dll" target="runtimes\win-x86\native\WinGetUtil.dll"/>
<file src="Build.x86release\src\x86\Release\WinGetUtil\WinGetUtil.pdb" target="runtimes\win-x86\native\WinGetUtil.pdb"/>
<file src="Build.x64release\schemas\JSON\manifests\**" target="content\schemas\JSON\manifests" />
<file src="Build.x64release\src\WinGetUtilInterop\bin\Release\netstandard2.0\WinGetUtilInterop.dll" target="lib/netstandard2.0/WinGetUtilInterop.dll" />
<file src="Build.x64release\src\WinGetUtilInterop\bin\Release\netstandard2.0\WinGetUtilInterop.pdb" target="lib/netstandard2.0/WinGetUtilInterop.pdb" />
<file src="Build.x64release\src\WinGetUtilInterop\bin\Release\netstandard2.1\WinGetUtilInterop.dll" target="lib/netstandard2.1/WinGetUtilInterop.dll" />
<file src="Build.x64release\src\WinGetUtilInterop\bin\Release\netstandard2.1\WinGetUtilInterop.pdb" target="lib/netstandard2.1/WinGetUtilInterop.pdb" />
<file src="Build.x64release\src\WinGetUtilInterop\build\Microsoft.WindowsPackageManager.Utils.targets" target="build/Microsoft.WindowsPackageManager.Utils.targets" />
</files>
</package>
6 changes: 3 additions & 3 deletions azure-pipelines.nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
FolderPath: src
Pattern: |
*\$(buildConfiguration)\WinGetUtil\WinGetUtil.dll
WinGetUtilInterop\bin\$(buildConfiguration)\netstandard2.0\WinGetUtilInterop.dll
WinGetUtilInterop\bin\$(buildConfiguration)\netstandard2.1\WinGetUtilInterop.dll
UseMinimatch: true
signConfigType: inlineSignParams
inlineOperation: |
Expand Down Expand Up @@ -114,8 +114,8 @@ jobs:
WinGetUtil.nuspec
src\$(buildPlatform)\$(buildConfiguration)\WinGetUtil\WinGetUtil.dll
src\$(buildPlatform)\$(buildConfiguration)\WinGetUtil\WinGetUtil.pdb
src\WinGetUtilInterop\bin\$(buildConfiguration)\netstandard2.0\WinGetUtilInterop.dll
src\WinGetUtilInterop\bin\$(buildConfiguration)\netstandard2.0\WinGetUtilInterop.pdb
src\WinGetUtilInterop\bin\$(buildConfiguration)\netstandard2.1\WinGetUtilInterop.dll
src\WinGetUtilInterop\bin\$(buildConfiguration)\netstandard2.1\WinGetUtilInterop.pdb
src\WinGetUtilInterop\build\Microsoft.WindowsPackageManager.Utils.targets
schemas\JSON\manifests\**
TargetFolder: '$(artifactsDir)'
Expand Down

0 comments on commit e577218

Please sign in to comment.