Skip to content

Address component governance issues by updating NuGet #1148

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

Merged
sharwell merged 1 commit into from
Feb 21, 2024
+10 −9
Merged

Address component governance issues by updating NuGet #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...ng/Microsoft.CodeAnalysis.Analyzer.Testing/Microsoft.CodeAnalysis.Analyzer.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@
</When>
<When Condition="'$(TargetFramework)' == 'net46'">
<PropertyGroup>
<NuGetApiVersion>4.9.6</NuGetApiVersion>
<NuGetApiVersion>4.5.3</NuGetApiVersion>
Comment thread
sharwell marked this conversation as resolved.
</PropertyGroup>
</When>
<When Condition="'$(TargetFramework)' == 'netstandard1.6'">
<PropertyGroup>
<NuGetApiVersion>4.9.6</NuGetApiVersion>
<NuGetApiVersion>4.5.3</NuGetApiVersion>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<NuGetApiVersion>6.3.3</NuGetApiVersion>
<NuGetApiVersion>6.3.4</NuGetApiVersion>
<DefineConstants>$(DefineConstants);NUGET_SIGNING</DefineConstants>
</PropertyGroup>
</Otherwise>
</Choose>
Expand Down
12 changes: 6 additions & 6 deletions ...osoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ReferenceAssemblies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
using NuGet.Protocol.Core.Types;
using NuGet.Resolver;

#if NET46 || NET472 || NETSTANDARD || NETCOREAPP3_1
#if NUGET_SIGNING
using NuGet.Packaging.Signing;
#endif

Expand Down Expand Up @@ -274,13 +274,13 @@ private async Task<ImmutableArray<MetadataReference>> ResolveCoreAsync(string la

var globalPathResolver = new PackagePathResolver(SettingsUtility.GetGlobalPackagesFolder(settings));
var localPathResolver = new PackagePathResolver(temporaryPackagesFolder);
#if NET452
#if NET452 || NET46 || NETSTANDARD1_6
var packageExtractionContext = new PackageExtractionContext(logger)
{
PackageSaveMode = PackageSaveMode.Defaultv3,
XmlDocFileSaveMode = XmlDocFileSaveMode.None,
};
#elif NET46 || NET472 || NETSTANDARD1_6 || NETSTANDARD2_0 || NETCOREAPP3_1
#elif NUGET_SIGNING
var packageExtractionContext = new PackageExtractionContext(
PackageSaveMode.Defaultv3,
XmlDocFileSaveMode.None,
Expand Down Expand Up @@ -350,7 +350,7 @@ private async Task<ImmutableArray<MetadataReference>> ResolveCoreAsync(string la
if (downloadResult.Status == DownloadResourceResultStatus.AvailableWithoutStream)
{
await PackageExtractor.ExtractPackageAsync(
#if !NET452
#if NUGET_SIGNING
#pragma warning disable SA1114 // Parameter list should follow declaration
downloadResult.PackageSource,
#pragma warning restore SA1114 // Parameter list should follow declaration
Expand All @@ -364,7 +364,7 @@ await PackageExtractor.ExtractPackageAsync(
{
Debug.Assert(downloadResult.PackageStream != null, "PackageStream should not be null if download result status != DownloadResourceResultStatus.AvailableWithoutStream");
await PackageExtractor.ExtractPackageAsync(
#if !NET452
#if NUGET_SIGNING
#pragma warning disable SA1114 // Parameter list should follow declaration
downloadResult.PackageSource,
#pragma warning restore SA1114 // Parameter list should follow declaration
Expand Down Expand Up @@ -562,7 +562,7 @@ private static async Task GetPackageDependenciesAsync(
var dependencyInfo = await dependencyInfoResource.ResolvePackage(
packageIdentity,
targetFramework,
#if !NET452
#if NUGET_SIGNING
cacheContext,
#endif
logger,
Expand Down