Skip to content

Commit 6df282d

Browse files
authored
Merge pull request #8937 from NuGet/dev
[ReleasePrep] RI of dev into main
2 parents a929ae1 + a4c7733 commit 6df282d

42 files changed

Lines changed: 967 additions & 83 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<package pattern="NuGet.Jobs.*" />
6262
<package pattern="NuGet.Services.*" />
6363
<package pattern="NuGet.StrongName.*" />
64+
<package pattern="NuGetGallery.Core" />
6465
<package pattern="Strathweb.CacheOutput.WebApi2.StrongName" />
6566
</packageSource>
6667
<packageSource key="nuget-server-upstreams">

src/AccountDeleter/EmptyFeatureFlagService.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ public bool IsAsyncAccountDeleteEnabled()
5151
throw new NotImplementedException();
5252
}
5353

54+
public bool IsComputeTargetFrameworkEnabled()
55+
{
56+
throw new NotImplementedException();
57+
}
58+
5459
public bool IsDeletePackageApiEnabled(User user)
5560
{
5661
throw new NotImplementedException();
@@ -81,7 +86,7 @@ public bool IsDisplayPackagePageV2PreviewEnabled(User user)
8186
throw new NotImplementedException();
8287
}
8388

84-
public bool IsDisplayTargetFrameworkEnabled()
89+
public bool IsDisplayTargetFrameworkEnabled(User user)
8590
{
8691
throw new NotImplementedException();
8792
}

src/Bootstrap/dist/css/bootstrap-theme.css

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Bootstrap/dist/js/bootstrap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* Bootstrap v3.4.1 (https://getbootstrap.com/)
3-
* Copyright 2011-2021 Twitter, Inc.
3+
* Copyright 2011-2022 Twitter, Inc.
44
* Licensed under the MIT license
55
*/
66

src/Bootstrap/less/theme/base.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,6 @@ img.reserved-indicator-icon {
335335
line-height: @package-list-line-height;
336336
color: @gray-light;
337337

338-
a:not(.more-tags) {
339-
color: @gray-light;
340-
}
341-
342338
li {
343339
list-style: none;
344340
display: list-item;

src/DatabaseMigrationTools/DatabaseMigrationTools.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@
6464
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
6565
<PrivateAssets>all</PrivateAssets>
6666
</PackageReference>
67-
<PackageReference Include="NuGet.Services.Validation">
68-
<Version>2.91.0</Version>
69-
</PackageReference>
7067
</ItemGroup>
7168
<ItemGroup>
7269
<ProjectReference Include="..\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj">

src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,12 @@ public bool IsDisplayPackagePageV2PreviewEnabled(User user)
270270
throw new NotImplementedException();
271271
}
272272

273-
public bool IsDisplayTargetFrameworkEnabled()
273+
public bool IsDisplayTargetFrameworkEnabled(User user)
274+
{
275+
throw new NotImplementedException();
276+
}
277+
278+
public bool IsComputeTargetFrameworkEnabled()
274279
{
275280
throw new NotImplementedException();
276281
}

src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@
8888
<PrivateAssets>all</PrivateAssets>
8989
</PackageReference>
9090
<PackageReference Include="NuGet.Jobs.Common">
91-
<Version>4.3.0-dev-5066115</Version>
91+
<Version>4.3.0-dev-5590084</Version>
9292
</PackageReference>
9393
<PackageReference Include="NuGet.Services.Cursor">
94-
<Version>2.91.0</Version>
94+
<Version>2.97.0</Version>
9595
</PackageReference>
9696
</ItemGroup>
9797
<ItemGroup>

src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@
7474
<PrivateAssets>all</PrivateAssets>
7575
</PackageReference>
7676
<PackageReference Include="NuGet.Build.Tasks.Pack">
77-
<Version>4.8.0</Version>
77+
<Version>6.0.0</Version>
78+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
79+
<PrivateAssets>all</PrivateAssets>
7880
</PackageReference>
7981
<PackageReference Include="NuGet.Jobs.Common">
80-
<Version>4.3.0-dev-5066115</Version>
82+
<Version>4.3.0-dev-5590084</Version>
8183
</PackageReference>
8284
</ItemGroup>
8385
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/NuGet.Services.Entities/NuGet.Services.Entities.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Version>10.0.3</Version>
1616
</PackageReference>
1717
<PackageReference Include="NuGet.Frameworks">
18-
<Version>5.9.0</Version>
18+
<Version>6.0.0</Version>
1919
</PackageReference>
2020
</ItemGroup>
2121

0 commit comments

Comments
 (0)