Merge pull request #10054 from NuGet/dev

 [ReleasePrep][2024.07.02]RI of dev into main

Author: drewgillies

CREDITS.txt

@@ -6,18 +6,6 @@ The .NET Foundation (http://www.dotnetfoundation.org).
 
 NuGet includes works distributed under the licenses listed below. The full text for most of the licenses listed below can be found in the LICENSE.txt file accompanying each work. The original copyright notices have been preserved within the respective files and or packages. Please refer to the specific files and/or packages for more detailed information about the authors, copyright notices, and licenses.
 
-Elmah 1.1
------ 
-Website:      http://code.google.com/p/elmah/ 
-Copyright:    Copyright (c) 2010 Atif Azis
-License:      Apache 2.0
-
-Elmah.Contrib.Mvc 1.0
-----
-Website:      http://nuget.org/List/Packages/Elmah.Contrib.Mvc
-Copyright:    Copyright (c) 2011, Fabian Vilers
-License:      Ms-PL
-
 jQuery 1.6.2
 ----
 Website:      http://jquery.com/

Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <NuGetClientPackageVersion>6.9.1</NuGetClientPackageVersion>
     <ServerCommonPackageVersion>2.120.0</ServerCommonPackageVersion>
-    <NuGetJobsPackageVersion>4.3.0-main-9408418</NuGetJobsPackageVersion>
+    <NuGetJobsPackageVersion>4.3.0-agr-gal-stsdk-9768098</NuGetJobsPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">

NuGet.config

@@ -69,10 +69,7 @@
       <package pattern="Microsoft.Internal.*" />
     </packageSource>
   </packageSourceMapping>
-  <activePackageSource>
-    <add key="All" value="(Aggregate source)" />
-  </activePackageSource>
   <disabledPackageSources>
     <clear />
   </disabledPackageSources>
-</configuration>
+</configuration>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.300",
+    "version": "8.0.301",
     "rollForward": "latestFeature"
   }
 }

src/AccountDeleter/Configuration/GalleryConfiguration.cs

@@ -28,14 +28,15 @@ public string SiteRoot
         public string AzureStorage_Auditing_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_UserCertificates_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_Content_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-        public string AzureStorage_Errors_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_Packages_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_FlatContainer_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_Statistics_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_Statistics_ConnectionString_Alternate { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_Uploads_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AzureStorage_Revalidation_ConnectionString { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public bool AzureStorageReadAccessGeoRedundant { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public bool AzureStorageUseMsi { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public string AzureStorageMsiClientId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public TimeSpan FeatureFlagsRefreshInterval { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public bool AdminPanelEnabled { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public bool AdminPanelDatabaseAccessEnabled { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

src/Bootstrap/Gruntfile.js

@@ -124,9 +124,6 @@ module.exports = function (grunt) {
       core: {
         src: 'dist/css/<%= pkg.name %>.css'
       },
-      theme: {
-        src: 'dist/css/<%= pkg.name %>-theme.css'
-      }
     },
 
     cssmin: {
@@ -141,13 +138,9 @@ module.exports = function (grunt) {
         }
       },
       core: {
-        src: 'dist/css/<%= pkg.name %>.css',
+        src: ['dist/css/<%= pkg.name %>.css', 'dist/css/<%= pkg.name %>-theme.css'],
         dest: 'dist/css/<%= pkg.name %>.min.css'
       },
-      theme: {
-        src: 'dist/css/<%= pkg.name %>-theme.css',
-        dest: 'dist/css/<%= pkg.name %>-theme.min.css'
-      }
     },
 
     copy: {
@@ -160,8 +153,7 @@ module.exports = function (grunt) {
         expand: true,
         cwd: 'dist/css/',
         src: [
-          'bootstrap.css',
-          'bootstrap-theme.css'
+          'bootstrap.min.css',
         ],
         dest: '../NuGetGallery/Content/gallery/css/'
       },
@@ -191,7 +183,7 @@ module.exports = function (grunt) {
   grunt.registerTask('dist-js', ['concat', 'uglify:core']);
 
   // CSS distribution task.
-  grunt.registerTask('dist-css', ['less:core', 'less:theme', 'postcss:core', 'postcss:theme', 'cssmin:core', 'cssmin:theme']);
+  grunt.registerTask('dist-css', ['less:core', 'less:theme', 'postcss:core', 'cssmin:core']);
 
   // Full distribution task.
   grunt.registerTask('dist', ['clean:dist', 'dist-css', 'copy:fonts', 'dist-js', 'copy:gallerycss', 'copy:galleryjs']);