Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects #3419

Merged
merged 2 commits into from
May 28, 2020
Merged

add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects #3419

merged 2 commits into from
May 28, 2020

Conversation

heng-liu
Copy link
Contributor

Bug

Fixes: NuGet/Home#9605
Regression: No

  • Last working version:
  • How are we preventing it in future:

Fix

Details:
The code map changed a little bit after we adding netstandard2.1(now netcoreapp5.0) to NuGet.Packaging related projects.
So adding netcoreapp5.0 TFM for NuGet.Build.Tasks.Console and NuGet.Packaging.Core projects

Testing/Validation

Tests Added: No
Reason for not adding tests:
Validation:

nkolev92
nkolev92 reviewed May 28, 2020
View reviewed changes
Copy link
Member

@nkolev92 nkolev92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to bump the version for the respective tests too?

src/NuGet.Core/NuGet.Build.Tasks.Console/NuGet.Build.Tasks.Console.csproj Outdated
@@ -1,4 +1,8 @@
<Project>
<PropertyGroup>
<RequiresSigningXplatAPIs>true</RequiresSigningXplatAPIs>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indent items in the prop group.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Fixed.

src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj Outdated
@@ -1,4 +1,8 @@
<Project>
<PropertyGroup>
<RequiresSigningXplatAPIs>true</RequiresSigningXplatAPIs>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indent items in the prop group.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Fixed.

@heng-liu
Copy link
Contributor Author

Do we need to bump the version for the respective tests too?

Checked and found the N.B.T.Console.Test.csproj has already targeted net5.0
https://github.com/NuGet/NuGet.Client/blob/dev-feature-xplatVerification/test/NuGet.Core.Tests/NuGet.Build.Tasks.Console.Test/NuGet.Build.Tasks.Console.Test.csproj#L2-L4

@heng-liu heng-liu requested a review from nkolev92 May 28, 2020 18:44
@heng-liu heng-liu merged commit 08d9864 into dev-feature-xplatVerification May 28, 2020
@heng-liu heng-liu deleted the dev-hengliu-xplat-addNet5To2MoreProjects branch May 28, 2020 20:02
heng-liu added a commit that referenced this pull request Jun 12, 2020
@heng-liu
add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects (#3419)
8644988 
* add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects
heng-liu added a commit that referenced this pull request Jun 16, 2020
@heng-liu
add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects (#3419)
4757984 
* add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects
heng-liu added a commit that referenced this pull request Jun 17, 2020
@heng-liu
add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects (#3419)
82a3e88 
* add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects
heng-liu added a commit that referenced this pull request Jun 19, 2020
@heng-liu
add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects (#3419)
1f4fb78 
* add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects
heng-liu added a commit that referenced this pull request Jun 19, 2020
@heng-liu
add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects (#3419)
43182cd 
* add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects
aortiz-msft pushed a commit that referenced this pull request Jun 20, 2020
@heng-liu @kartheekp-ms
@zivkan @zkat
Enable cross-platform package signature verification for restore (#3458)
784274c 
* Signing: Support signature verification on .NET Core

Remove 2nd N.B.T.P package (#2984)

remove WorkaroundNetStandard target, change SDK for build from 3.0 preview to 3.1 stable (#3161)

* remove WorkaroundNetStandard target, change SDK for build from 3.0 preview to 3.1 stable version, fix error; change LockSDKVersion default value from empty string to false; apply Linux workaround in my change

Retarget to netcore5.0 (#3162)

* retarget to netcore5.0;  Linux script workaround need to apply for downloading SDK for build

add pkcs and cng packages

Temporary fix on patching SDK, add System.Security.Cryptography.Pkcs.dll and update deps.json, use dll from .nuget/packages

Address PR comments

implement add cert to store on Mac; display openssl version (#3166)

Implement timestamp integrity verification; Implement an equivalent NativeCms; enable signing APIs and tests (#3168)

* implement timestamp integrity verification; implement ManagedCms; enable signing APIs and tests

fix xplat verification branch after rebase (#3191)

Fixes: NuGet/Home#9012

check different cross-platform error messages for self-signed cert test (#3208)

Fixes: NuGet/Home#8933

Xplat Signing/Verification : Fix broken tests for setting privatekey of a X509Certificate2 (#3195)

use workaround to set private key for X509Certificate2 (netcore), change ToRSA to workaround for netcore(especially for non-windows)

enable PathTooLongException test (#3216)

Fixes: NuGet/Home#8920

enable TrustedSignerActionsProvider on netcore, along with tests (#3213)

Fixes: NuGet/Home#8921

Enable SignedPackageIntegrityVerificationTests for netcore5.0 (#3220)

Enable SignedPackageIntegrityVerificationTests for netcore, remove extra preprocessors

Enable timestamp provider test and fix 3 broken tests (#3210)

enable all unit tests; enable 8 more tests; enable timestampProviderTest; fix 3 broken tests in TimestampProviderTests

Fix 4 tests in SignatureTrustAndValidityVerificationProviderTests (#3242)

fix untrusted msg for different platforms

fixed broken tests using utility methods (#3263)

disable outdated tests (#3274)

enable 4 tests on Mac (#3275)

fix 5 broken tests in SignatureTrustAndValidityVerificationProviderTests, add workaround for Linux (#3252)

fix broken test case ExecuteCommandAsync_WithAmbiguousMatch_ThrowsAsync (#3291)

* Enable test ExecuteCommandAsync_WithMultiplePackagesAndInvalidCertificate_RaisesErrorsOnceAsync (#3342)

* enable a test, change the comments; extend test limitation on Linux

* Updated SDK version and removed the hardcoded version when reading from JSON file (#3372)

* update Pkcs package to the preview3 version (#3382)

* fix 2 warnings in CodeAnalysis (#3388)

* fix 2 warnings in CodeAnalysis

* disable dynamic revoke tests on Mac (#3373)

* fix 1 test (#3371)

* Fix more warnings reported by CodeAnalysis (#3393)

* fix string warnings raised by CodeAnalysis

* Retarget xplat verification to netcoreapp5.0 (#3386)

* retarget netcoreapp5.0 (a workaround for net5.0)

* fix all the rest warnings raised by code analysis (#3401)

* Suppress CA1307 warning for string.GetHashCode() method (#3404)

* Linux test failure due to generic exception (#3405)

* add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects (#3419)

* add TFM netcoreapp5.0 to N.B.T.Console and N.P.Core projects

* add PIN prompt for netcore (#3389)

* Run dotnet nuget tests on multiple TFMs (#3387)

* enabled mac assertions

* Revert "enabled mac assertions"

This reverts commit d8a52e2.

* Enable test GetCertificateChain_WithUntrustedRoot_Throws on Mac (#3428)

* run signing integration tests cross plat (#3415)

* added GetNonce() to IRfc3161TimestampRequest interface (#3427)

* disable test for netcore (#3445)

* log Status and StatusInformation, fix 2 tests (#3268)

* Disable verification during extraction for Mono, disable a test on Mono (#3451)

* disable verification during extraction on mono,disable a mono test on Mac

* adapt 2 newly added dotnet integration tests for multiple TFMs (#3460)

* remove useless Sdk2x.targets

* get TimestampTests working again (#3218)

* get TimestampTests working again

Fixes: NuGet/Home#8935

* change GetTimestampAsync into internal

* fix runFuncTests.sh and InstallCLIforBuild.sh

* address feedback

* upgrade dotnet 5 to preview4 as preview5 is broken

* Fix exception thrown in SigningTestFixture during disposing (#3464)

Co-authored-by: Kartheek Penagamuri <52756182+kartheekp-ms@users.noreply.github.com>
Co-authored-by: Andy Zivkovic <zivkan@users.noreply.github.com>
Co-authored-by: Kat Marchán <kzm@zkat.tech>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zivkan zivkan zivkan approved these changes

@nkolev92 nkolev92 nkolev92 approved these changes

@aortiz-msft aortiz-msft Awaiting requested review from aortiz-msft

@cristinamanum cristinamanum Awaiting requested review from cristinamanum

@dominoFire dominoFire Awaiting requested review from dominoFire

@donnie-msft donnie-msft Awaiting requested review from donnie-msft

@dtivel dtivel Awaiting requested review from dtivel

@kartheekp-ms kartheekp-ms Awaiting requested review from kartheekp-ms

@rrelyea rrelyea Awaiting requested review from rrelyea

@zkat zkat Awaiting requested review from zkat

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@heng-liu @nkolev92 @zivkan