Merge pull request #10370 from NuGet/dev

[ReleasePrep][2025.03.18]RI of dev into main

Author: v-manil2

Directory.Packages.props

@@ -3,7 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
     <EnablePackageVersionOverride>true</EnablePackageVersionOverride>
-    <NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
+    <NuGetClientPackageVersion>6.13.2</NuGetClientPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />
@@ -81,6 +81,7 @@
     <PackageVersion Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.65.0" />
     <PackageVersion Include="Microsoft.Identity.Web" Version="3.6.2" />
+    <PackageVersion Include="Microsoft.Internal.NuGet.Testing.SignedPackages" Version="6.13.2-rc.1" />
     <PackageVersion Include="Microsoft.Net.Http" Version="2.2.29" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.2.2" />
@@ -90,6 +91,7 @@
     <PackageVersion Include="Microsoft.Owin.Security" Version="4.2.2" />
     <PackageVersion Include="Microsoft.Owin" Version="4.2.2" />
     <PackageVersion Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
+    <PackageVersion Include="Microsoft.Security.Utilities.Core" Version="1.12.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.8.24" />
     <PackageVersion Include="Microsoft.Web.Infrastructure" Version="1.0.0" />
@@ -135,16 +137,17 @@
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
     <PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
-    <PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
+    <PackageVersion Include="System.Formats.Asn1" Version="8.0.2" />
     <PackageVersion Include="System.Linq.Expressions" Version="4.3.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Reflection.Metadata" Version="1.7.0-preview1-26717-04" />
     <PackageVersion Include="System.Runtime" Version="4.3.1" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
+    <PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
     <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
-    <PackageVersion Include="Test.Utility" Version="6.4.2-rc.25" />
     <PackageVersion Include="UAParser" Version="3.1.44" />
     <PackageVersion Include="WebActivatorEx" Version="2.0.6" />
     <PackageVersion Include="WebGrease" Version="1.6.0" />

NuGet.config

@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
     <add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
   </packageSources>
@@ -10,6 +11,9 @@
   </disabledPackageSources>
   <packageSourceMapping>
     <clear />
+    <packageSource key="dotnet-tools">
+      <package pattern="Microsoft.Internal.NuGet.Testing.SignedPackages" />
+    </packageSource>
     <packageSource key="NuGet.org">
       <package pattern="Antlr" />
       <package pattern="AngleSharp.*" />
@@ -78,7 +82,6 @@
       <package pattern="NuGet.Services.*" />
       <package pattern="NuGet.StrongName.*" />
       <package pattern="Strathweb.CacheOutput.WebApi2.StrongName" />
-      <package pattern="Test.Utility" />
     </packageSource>
     <packageSource key="nuget-server-upstreams">
       <package pattern="Microsoft.Internal.*" />

python/StatsLogParser/loginterpretation/packagedefinition.py

@@ -91,13 +91,14 @@ def from_nuget_exe_url(request_url) -> Optional[PackageDefinition]:
         if not request_url or not request_url.lower().endswith(PackageDefinition.NUGET_EXE_URL_ENDING):
             return None
 
-        # path example: /artifacts/win-x86-commandline/v5.9.1/nuget.exe
+        # origin path example: /artifacts/win-x86-commandline/v5.9.1/nuget.exe
+        # new CDN logs request path, not origin path:  /win-x86-commandline/v5.11.6/nuget.exe
 
         request_url = urllib.parse.unquote(request_url)
         url_segments = [segment for segment in request_url.split('/') if segment]
 
-        if len(url_segments) < 4:
-            # proper nuget.exe URL paths have at least 4 segments
+        if len(url_segments) < 2:
+            # proper nuget.exe URL paths have at least 2 segments
             return None
 
         suspected_version_segment = url_segments[-2].lower()

python/StatsLogParser/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "loginterpretation"
-version = "0.2.0"
+version = "0.3.0"
 description = "Helper functions for parsing CDN logs to generate statistics"
 authors = ["NuGet Server Team Engineering <[email protected]>"]
 readme = "README.md"

python/StatsLogParser/tests/test_packagedefinition.py

@@ -52,10 +52,12 @@ def test_from_request_url_returns_none_when_invalid_url(request_url):
     ("5.9.1", "https://localhost/artifacts/win-x86-commandline/v5.9.1/nuget.exe"),
     ("5.8.0-preview.2", "https://localhost/artifacts/win-x86-commandline/v5.8.0-preview.2/nuget.exe"),
     ("3.5.0-beta2", "https://localhost/artifacts/win-x86-commandline/v3.5.0-beta2/nuget.exe"),
-    ("latest", "https://localhost/artifacts/win-x86-commandline/latest/nuget.exe")])
+    ("latest", "https://localhost/artifacts/win-x86-commandline/latest/nuget.exe"),
+    ("5.11.6", "/win-x86-commandline/v5.11.6/nuget.exe"),
+    ("latest", "/win-x86-commandline/latest/nuget.exe")])
 def test_from_nuget_exe_url_extracts_nuget_exe_version(expected_version, request_url):
     found =  PackageDefinition.from_nuget_exe_url(request_url)
-    assert found and found.package_version == expected_version
+    assert found and found.package_id == 'tool/nuget.exe' and found.package_version == expected_version
 
 @pytest.mark.parametrize("request_url", [
     "",
@@ -66,7 +68,7 @@ def test_from_nuget_exe_url_extracts_nuget_exe_version(expected_version, request
     "http://localhost/artifacts/win-x86-commandline/v3.5.0/get.exe"
     ])
 def test_from_nuget_exe_url_returns_none_when_invalid_url(request_url):
-    found =  PackageDefinition.from_nuget_exe_url(request_url)
+    found = PackageDefinition.from_nuget_exe_url(request_url)
     assert not found
 
 # To invoke the pytest framework and run all tests

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

@@ -488,14 +488,25 @@
 
           .copy-button {
             display: flex;
-
+            
             button {
               display: flex;
               gap: 4px;
               padding: 2px 8px;
               justify-content: center;
               align-items: center;
             }
+
+            .package-manager-command-header {
+              display: inline;
+              font-size: 14px;
+              font-family: @font-family-base;
+              padding: 0px 8px;
+              line-height: 75%;
+              color: var(--neutralForeground1Rest);
+              justify-content: center;
+              align-items: center;
+            }
           }
         }
 

src/Bootstrap/less/theme/page-display-package.less

@@ -104,6 +104,7 @@ static SupportedFrameworks()
         public static class TfmFilters {
             public static readonly List<NuGetFramework> NetTfms = new List<NuGetFramework>
             {
+                Net90,
                 Net80,
                 Net70,
                 Net60,