[main] Update dependencies from dotnet/runtime (#1969)

* Update dependencies from https://github.com/dotnet/runtime build 20231017.5 Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging From Version 8.0.0-rtm.23513.17 -> To Version 9.0.0-alpha.1.23517.5 * Update dependencies from https://github.com/dotnet/runtime build 20231023.1 Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging From Version 8.0.0-rtm.23517.16 -> To Version 9.0.0-alpha.1.23523.1 * Update Version.Details.xml --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Jones <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>
dotnet · Oct 24, 2023 · 57d13ca · 57d13ca
1 parent c18a4af
commit 57d13ca
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 75 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -70,7 +70,7 @@
   "remoteEnv": {
     "PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
     "DOTNET_MULTILEVEL_LOOKUP": "0",
-    "TARGET": "net8.0",
+    "TARGET": "net9.0",
     "DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
   },
   // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,4 +10,9 @@
     <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
   </PropertyGroup>
 
+  <!-- TODO: Remove when Arcades updates NetCurrent to net9.0. -->
+  <PropertyGroup>
+    <NetCurrent>net9.0</NetCurrent>
+  </PropertyGroup>
+
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,12 +3,13 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <!-- Using multiple feeds isn't supported by Maestro: https://github.com/dotnet/arcade/issues/14155. -->
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet.Annotations" Version="$(BenchmarkDotNetAnnotationsVersion)" />
     <PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
     <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>

diff --git a/NuGet.config b/NuGet.config
@@ -12,63 +12,5 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
   </packageSources>
-  <!-- Define mappings by adding package patterns beneath the target source. -->
-  <packageSourceMapping>
-    <!-- key value for <packageSource> should match key values from <packageSources> element -->
-    <packageSource key="dotnet-eng">
-      <package pattern="MicroBuild.*" />
-      <package pattern="Microsoft.*" />
-      <package pattern="sn" />
-      <package pattern="xunit*" />
-    </packageSource>
-    <packageSource key="dotnet-libraries">
-      <package pattern="System.*" />
-      <package pattern="Microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet-libraries-transport">
-      <package pattern="Microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet9">
-      <package pattern="Microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet9-transport">
-      <package pattern="Microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet8">
-      <package pattern="System.*" />
-      <package pattern="Microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet8-transport">
-      <package pattern="Microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet-tools">
-      <package pattern="Microsoft.*" />
-      <package pattern="NuGet.*" />
-    </packageSource>
-    <packageSource key="dotnet-public">
-      <package pattern="BenchmarkDotNet*" />
-      <package pattern="CommandlineParser" />
-      <package pattern="coverlet.collector" />
-      <package pattern="DiffPlex" />
-      <package pattern="Gee.External.Capstone" />
-      <package pattern="Grpc.*" />
-      <package pattern="Google.Protobuf" />
-      <package pattern="Humanizer.Core" />
-      <package pattern="Iced" />
-      <package pattern="MicroBuild.*" />
-      <package pattern="Microsoft.*" />
-      <package pattern="MSTest.*" />
-      <package pattern="NETStandard.Library" />
-      <package pattern="Newtonsoft.Json" />
-      <package pattern="NuGet.*" />
-      <package pattern="NUnit*" />
-      <package pattern="Perfolizer" />
-      <package pattern="runtime.*" />
-      <package pattern="Swashbuckle.*" />
-      <package pattern="System.*" />
-      <package pattern="vswhere" />
-      <package pattern="xunit*" />
-    </packageSource>
-  </packageSourceMapping>
   <disabledPackageSources />
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -29,14 +29,18 @@
       <Uri>https://github.com/dotnet/symreader</Uri>
       <Sha>27e584661980ee6d82c419a2a471ae505b7d122e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0-rtm.23517.16">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-alpha.1.23523.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>6f7af556d2761b0c93299cb88c61e4b747d6176a</Sha>
-      <SourceBuild RepoName="runtime" />
+      <Sha>2959e1acd09aec0f1e59db9cbe41f3701b0bd4dd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rtm.23517.16">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-alpha.1.23523.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>6f7af556d2761b0c93299cb88c61e4b747d6176a</Sha>
+      <Sha>2959e1acd09aec0f1e59db9cbe41f3701b0bd4dd</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-alpha.1.23523.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>2959e1acd09aec0f1e59db9cbe41f3701b0bd4dd</Sha>
+      <SourceBuild RepoName="runtime" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.430701">
       <Uri>https://github.com/dotnet/command-line-api</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -14,6 +14,8 @@
     <UseVSTestRunner>true</UseVSTestRunner>
     <!-- Prohibit the usage of .NET Standard 1.x dependencies. -->
     <FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+    <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
   </PropertyGroup>
   <PropertyGroup>
     <!-- command-line-api -->
@@ -33,9 +35,8 @@
     <!-- roslyn-sdk -->
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
     <!-- runtime -->
-    <MicrosoftBclAsyncInterfacesVersion>8.0.0-rtm.23517.16</MicrosoftBclAsyncInterfacesVersion>
-    <MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-rtm.23517.16</MicrosoftExtensionsFileSystemGlobbingVersion>
-    <MicrosoftExtensionsLoggingVersion>8.0.0-rtm.23517.16</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsFileSystemGlobbingVersion>9.0.0-alpha.1.23523.1</MicrosoftExtensionsFileSystemGlobbingVersion>
+    <MicrosoftExtensionsLoggingVersion>9.0.0-alpha.1.23523.1</MicrosoftExtensionsLoggingVersion>
     <!-- symreader -->
     <MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
     <!-- external -->

diff --git a/eng/format-verifier.ps1 b/eng/format-verifier.ps1
@@ -79,7 +79,7 @@ try {
 
             if ($stage -eq "format-workspace") {
                 Write-Output "$(Get-Date) - $solutionFile - Formatting Workspace"
-                $output = & $parentDotNetPath "$currentLocation/artifacts/bin/dotnet-format/Release/net8.0/dotnet-format.dll" $solution --no-restore -v diag --verify-no-changes | Out-String
+                $output = & $parentDotNetPath "$currentLocation/artifacts/bin/dotnet-format/Release/net9.0/dotnet-format.dll" $solution --no-restore -v diag --verify-no-changes | Out-String
                 Write-Output $output.TrimEnd()
 
                 # Ignore CheckFailedExitCode since we don't expect these repos to be properly formatted.
@@ -101,7 +101,7 @@ try {
 
     if ($stage -eq "format-folder") {
         Write-Output "$(Get-Date) - $folderName - Formatting Folder"
-        $output = & $parentDotNetPath "$currentLocation/artifacts/bin/dotnet-format/Release/net8.0/dotnet-format.dll" whitespace $repoPath --folder -v diag --verify-no-changes | Out-String
+        $output = & $parentDotNetPath "$currentLocation/artifacts/bin/dotnet-format/Release/net9.0/dotnet-format.dll" whitespace $repoPath --folder -v diag --verify-no-changes | Out-String
         Write-Output $output.TrimEnd()
 
         # Ignore CheckFailedExitCode since we don't expect these repos to be properly formatted.

diff --git a/eng/perf.ps1 b/eng/perf.ps1
@@ -45,17 +45,17 @@ try {
 
     if ($micro) {
         # Default case, run very small tests
-        Invoke-Expression 'dotnet run -c Release -f net8.0 --runtimes net8.0 --project dotnet-format.Performance.csproj -- --memory --join --filter Microsoft.CodeAnalysis.Tools.Perf.Micro*'
+        Invoke-Expression 'dotnet run -c Release -f net9.0 --runtimes net9.0 --project dotnet-format.Performance.csproj -- --memory --join --filter Microsoft.CodeAnalysis.Tools.Perf.Micro*'
         exit 0
     }
 
     if ($real) {
-        Invoke-Expression 'dotnet run -c Release -f net8.0 --runtimes net8.0 --project dotnet-format.Performance.csproj -- --memory --join --filter Microsoft.CodeAnalysis.Tools.Perf.Real*'
+        Invoke-Expression 'dotnet run -c Release -f net9.0 --runtimes net9.0 --project dotnet-format.Performance.csproj -- --memory --join --filter Microsoft.CodeAnalysis.Tools.Perf.Real*'
         exit 0
     }
 
     if ($all) {
-        Invoke-Expression 'dotnet run -c Release -f net8.0 --runtimes net8.0 --project dotnet-format.Performance.csproj -- --memory --join --filter *'
+        Invoke-Expression 'dotnet run -c Release -f net9.0 --runtimes net9.0 --project dotnet-format.Performance.csproj -- --memory --join --filter *'
         exit 0
     }
 }

diff --git a/global.json b/global.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "8.0.100-rtm.23506.1",
+    "version": "9.0.100-alpha.1.23511.2",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "8.0.100-rtm.23506.1"
+    "dotnet": "9.0.100-alpha.1.23511.2"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2"