Skip to content

[automated] Merge branch 'release/8.0' => 'release/8.0-staging' #94865

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
merged 50 commits into from
Nov 17, 2023
Merged

[automated] Merge branch 'release/8.0' => 'release/8.0-staging' #94865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e32d6d4
Merged PR 33648: [release/8.0] Update MsQuic
CarnaViire Sep 12, 2023
8427567
Merge in 'release/8.0' changes
dotnet-bot Sep 13, 2023
c831da8
Merge in 'release/8.0' changes
dotnet-bot Sep 13, 2023
760ca2f
Merge in 'release/8.0' changes
dotnet-bot Sep 14, 2023
362753b
Merge in 'release/8.0' changes
dotnet-bot Sep 14, 2023
a53d241
Merge in 'release/8.0' changes
dotnet-bot Sep 14, 2023
09ad145
Merge in 'release/8.0' changes
dotnet-bot Sep 14, 2023
ed87912
Merge in 'release/8.0' changes
dotnet-bot Sep 14, 2023
cf07575
Merge in 'release/8.0' changes
dotnet-bot Sep 14, 2023
f0e158e
Merge in 'release/8.0' changes
dotnet-bot Sep 14, 2023
6711bc7
Merge in 'release/8.0' changes
dotnet-bot Sep 14, 2023
d2e9dee
Merge in 'release/8.0' changes
dotnet-bot Sep 15, 2023
f8377ff
Merge in 'release/8.0' changes
dotnet-bot Sep 15, 2023
ec02a4f
Merge in 'release/8.0' changes
dotnet-bot Sep 15, 2023
7ed5a63
Merge in 'release/8.0' changes
dotnet-bot Sep 15, 2023
ddc57a1
Merge in 'release/8.0' changes
dotnet-bot Sep 15, 2023
df96adb
Merge in 'release/8.0' changes
dotnet-bot Sep 15, 2023
2ce7823
Merge in 'release/8.0' changes
dotnet-bot Sep 16, 2023
5ae97d2
Merge in 'release/8.0' changes
dotnet-bot Sep 16, 2023
c342ef7
Merge in 'release/8.0' changes
dotnet-bot Sep 16, 2023
2b7c2f0
Merge in 'release/8.0' changes
dotnet-bot Sep 18, 2023
c4aed41
Merge in 'release/8.0' changes
dotnet-bot Sep 18, 2023
bce5c3a
Merge in 'release/8.0' changes
dotnet-bot Sep 18, 2023
cd90aa3
Merge in 'release/8.0' changes
dotnet-bot Sep 18, 2023
fff91db
Merge in 'release/8.0' changes
dotnet-bot Sep 18, 2023
aa4e1d1
Merge in 'release/8.0' changes
dotnet-bot Sep 18, 2023
0a6de94
Merge in 'release/8.0' changes
dotnet-bot Sep 18, 2023
b362c3f
Merge in 'release/8.0' changes
dotnet-bot Sep 18, 2023
312748d
Merge in 'release/8.0' changes
dotnet-bot Sep 19, 2023
441970e
Merge in 'release/8.0' changes
dotnet-bot Sep 19, 2023
5b3b296
Merge in 'release/8.0' changes
dotnet-bot Sep 19, 2023
7294c80
Merge in 'release/8.0' changes
dotnet-bot Sep 19, 2023
1d2f47d
Merge in 'release/8.0' changes
dotnet-bot Sep 19, 2023
437356c
Merge in 'release/8.0' changes
dotnet-bot Sep 19, 2023
4796219
Split commands in FtpWebRequest
liveans Oct 5, 2023
2066e8f
Apply suggestions from code review
mmitche Oct 25, 2023
17ea9ab
Merged PR 34793: [internal/release/8.0] Merge from public
mmitche Oct 25, 2023
a60d358
Merge in 'release/8.0' changes
dotnet-bot Oct 25, 2023
0395649
Merge in 'release/8.0' changes
dotnet-bot Oct 31, 2023
5535e31
Merge in 'release/8.0' changes
dotnet-bot Oct 31, 2023
82089e5
[release/8.0] Update dependencies from dnceng/internal/dotnet-optimiz…
dotnet-maestro[bot] Nov 14, 2023
050e196
Merge commit '5535e31a712343a63f5d7d796cd874e563e5ac14' into internal…
vseanreesermsft Nov 14, 2023
4665d66
Merge pull request #94731 from vseanreesermsft/internal-merge-8.0-202…
carlossanlop Nov 15, 2023
fef3702
[release/8.0] Update dependencies from dotnet/emsdk (#94516)
dotnet-maestro[bot] Nov 15, 2023
5c87f4d
Merge branch 'release/8.0' into release/8.0-staging
carlossanlop Nov 16, 2023
aab2b2e
[release/8.0] Update dependencies from dotnet/arcade (#94792)
dotnet-maestro[bot] Nov 16, 2023
069bd68
Merge pull request #94819 from carlossanlop/release/8.0-staging
carlossanlop Nov 16, 2023
be88b59
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] Nov 16, 2023
656f461
Downgrade 6 & 7 per tactics (#94863)
lewing Nov 16, 2023
0af82fd
Merge branch 'release/8.0-staging' into merge/release/8.0-to-release/…
carlossanlop Nov 16, 2023
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
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,79 +111,79 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23556.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23558.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -334,25 +334,25 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23556.5">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23564.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
</Dependency>
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.23525.5">
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.23565.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.23523.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
Expand Down Expand Up @@ -392,13 +392,13 @@
<Sha>e9d13cbe7e8c1d52ce276a8655f52a87e1017c46</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
</Dependency>
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
and flow in as dependencies of the packages produced by runtime. -->
Expand Down
44 changes: 22 additions & 22 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<MinorVersion>0</MinorVersion>
<PatchVersion>1</PatchVersion>
<SdkBandVersion>8.0.100</SdkBandVersion>
<PackageVersionNet7>7.0.$([MSBuild]::Add($(PatchVersion),14))</PackageVersionNet7>
<PackageVersionNet7>7.0.$([MSBuild]::Add($(PatchVersion),13))</PackageVersionNet7>
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))</PackageVersionNet6>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration>
Expand Down Expand Up @@ -87,21 +87,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23556.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23556.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23556.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23556.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23556.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23556.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23556.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23556.5</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23564.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23564.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23564.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23564.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23564.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23564.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23564.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23564.4</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -158,12 +158,12 @@
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.23558.5</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.23558.5</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationwindows_ntarm64MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationlinuxarm64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23525.5</optimizationPGOCoreCLRVersion>
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationwindows_ntarm64MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationlinuxarm64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23565.3</optimizationPGOCoreCLRVersion>
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>16.11.29-beta1.23404.4</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/xplat-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
# Public Windows Build Pool
${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals windows.vs2022.amd64.open
demands: ImageOverride -equals windows.vs2022preview.amd64.open


${{ if eq(parameters.helixQueuesTemplate, '') }}:
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "8.0.100-rtm.23506.1",
"version": "8.0.100",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "8.0.100-rtm.23506.1"
"dotnet": "8.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23556.5",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23556.5",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23564.4",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23564.4",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Requests/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@
<data name="net_ftp_receivefailure" xml:space="preserve">
<value>The underlying connection was closed: An unexpected error occurred on a receive</value>
</data>
<data name="net_ftp_no_newlines" xml:space="preserve">
<value>CRLF character pair is not allowed in FtpWebRequest inputs.</value>
</data>
<data name="net_webstatus_NameResolutionFailure" xml:space="preserve">
<value>The remote name could not be resolved</value>
</data>
Expand Down
5 changes: 5 additions & 0 deletions src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,11 @@ private string GetPortCommandLine()
/// </summary>
private static string FormatFtpCommand(string command, string? parameter)
{
if (parameter is not null && parameter.Contains("\r\n", StringComparison.Ordinal))
{
throw new FormatException(SR.net_ftp_no_newlines);
}

return string.IsNullOrEmpty(parameter) ?
command + "\r\n" :
command + " " + parameter + "\r\n";
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,9 @@ internal FtpWebRequest(Uri uri)
if ((object)uri.Scheme != (object)Uri.UriSchemeFtp)
throw new ArgumentOutOfRangeException(nameof(uri));

if (uri.OriginalString.Contains("\r\n", StringComparison.Ordinal))
throw new FormatException(SR.net_ftp_no_newlines);

_timerCallback = new TimerThread.Callback(TimerCallback);
_syncObject = new object();

Expand Down
21 changes: 21 additions & 0 deletions src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,27 @@ public void Ftp_RenameFileSubDir_Success(FtpExecutionMode mode)
Assert.False(DirExists(mode, dir));
}

[Fact]
public void Ftp_Ignore_NewLine_Constructor_Throws_FormatException()
{
string uri = absoluteUri + Guid.NewGuid().ToString();

Assert.Throws<FormatException>(() => WebRequest.Create($"{uri}\r\n{WebRequestMethods.Ftp.AppendFile} {Guid.NewGuid().ToString()}"));
}

[ConditionalFact(nameof(LocalServerAvailable))]
public void Ftp_Ignore_NewLine_GetRequestStream_And_GetResponse_Throws_FormatException_As_InnerException()
{
FtpWebRequest ftpWebRequest = (FtpWebRequest)WebRequest.Create(absoluteUri + Guid.NewGuid().ToString());
ftpWebRequest.Method = "APPE";
ftpWebRequest.Credentials = new NetworkCredential("test\r\ntest2", "test\r\ntest2");
var requestException = Assert.Throws<WebException>(() => ftpWebRequest.GetRequestStream());
Assert.True(requestException.InnerException is FormatException);

var responseException = Assert.Throws<WebException>(() => ftpWebRequest.GetResponse());
Assert.True(responseException.InnerException is FormatException);
}

private static async Task<MemoryStream> DoAsync(FtpWebRequest request, MemoryStream requestBody)
{
if (requestBody != null)
Expand Down