commit e57721835861ad9662c9de17a68d5838e69706c6
parent 3bcd69d14e348732a63026e56e26c816f67f3f65
Author: Ruben Guerrero <rubengu@microsoft.com>
Date: Thu, 1 Feb 2024 15:30:02 -0800
Retarget to netstandard2.1 (#4130) (#4132)
Cherry-pick #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)
Diffstat:
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WinGetUtil.nuspec b/WinGetUtil.nuspec
@@ -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>
\ No newline at end of file
diff --git a/azure-pipelines.nuget.yml b/azure-pipelines.nuget.yml
@@ -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: |
@@ -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)'