Skip to content

Commit b841d76

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #94865 from dotnet-maestro-bot/merge/release/8.0-to-release/8.0-staging
[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
2 parents 1f53b81 + 0af82fd commit b841d76

File tree

8 files changed

+108
-76
lines changed

8 files changed

+108
-76
lines changed

‎eng/Version.Details.xml‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23556.5">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23564.4">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
116+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23556.5">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23564.4">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
126+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23556.5">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23564.4">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
130+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23556.5">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23564.4">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
134+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23556.5">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23564.4">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
138+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23556.5">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23564.4">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
142+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23556.5">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23564.4">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
146+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23556.5">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23564.4">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
150+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23556.5">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
154+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23556.5">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23564.4">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
158+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23556.5">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23564.4">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
162+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23556.5">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23564.4">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
166+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23556.5">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23564.4">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
170+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23556.5">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23564.4">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
174+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23556.5">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23564.4">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
178+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23556.5">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23564.4">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
182+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23556.5">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23564.4">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
186+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23558.5">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,25 +334,25 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>480b9159eb7e69b182a87581d5a336e97e0b6dae</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23556.5">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23564.4">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>080141bf0f9f15408bb6eb8e301b23bddf81d054</Sha>
339+
<Sha>0aaeafef60933f87b0b50350313bb2fd77defb5d</Sha>
340340
</Dependency>
341-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
341+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
343-
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
343+
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
344344
</Dependency>
345-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
345+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
346346
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
347-
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
347+
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
348348
</Dependency>
349-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
349+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
350350
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
351-
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
351+
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
352352
</Dependency>
353-
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.23525.5">
353+
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.23565.3">
354354
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
355-
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
355+
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
356356
</Dependency>
357357
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.23523.2">
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
@@ -392,13 +392,13 @@
392392
<Sha>e9d13cbe7e8c1d52ce276a8655f52a87e1017c46</Sha>
393393
<SourceBuild RepoName="sdk" ManagedOnly="true" />
394394
</Dependency>
395-
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
395+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
396396
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
397-
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
397+
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
398398
</Dependency>
399-
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23525.5">
399+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23565.3">
400400
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
401-
<Sha>d80a861521d84459c9290c31127b2a0ce511f279</Sha>
401+
<Sha>5914dbda1860830a56179692058d94c9f615deda</Sha>
402402
</Dependency>
403403
<!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
404404
and flow in as dependencies of the packages produced by runtime. -->

‎eng/Versions.props‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<MinorVersion>0</MinorVersion>
88
<PatchVersion>1</PatchVersion>
99
<SdkBandVersion>8.0.100</SdkBandVersion>
10-
<PackageVersionNet7>7.0.$([MSBuild]::Add($(PatchVersion),14))</PackageVersionNet7>
10+
<PackageVersionNet7>7.0.$([MSBuild]::Add($(PatchVersion),13))</PackageVersionNet7>
1111
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11))</PackageVersionNet6>
1212
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
1313
<PreReleaseVersionIteration>
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23556.5</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23556.5</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23556.5</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23556.5</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23556.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23556.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23556.5</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23556.5</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23556.5</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23564.4</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23564.4</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23564.4</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23564.4</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23564.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23564.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23564.4</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23564.4</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23564.4</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->
@@ -158,12 +158,12 @@
158158
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.23558.5</SystemWindowsExtensionsTestDataVersion>
159159
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.23558.5</MicrosoftDotNetCilStripSourcesVersion>
160160
<!-- dotnet-optimization dependencies -->
161-
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationwindows_ntx64MIBCRuntimeVersion>
162-
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationwindows_ntx86MIBCRuntimeVersion>
163-
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationwindows_ntarm64MIBCRuntimeVersion>
164-
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationlinuxx64MIBCRuntimeVersion>
165-
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23525.5</optimizationlinuxarm64MIBCRuntimeVersion>
166-
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23525.5</optimizationPGOCoreCLRVersion>
161+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationwindows_ntx64MIBCRuntimeVersion>
162+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationwindows_ntx86MIBCRuntimeVersion>
163+
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationwindows_ntarm64MIBCRuntimeVersion>
164+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationlinuxx64MIBCRuntimeVersion>
165+
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23565.3</optimizationlinuxarm64MIBCRuntimeVersion>
166+
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23565.3</optimizationPGOCoreCLRVersion>
167167
<!-- Not auto-updated. -->
168168
<MicrosoftDiaSymReaderNativeVersion>16.11.29-beta1.23404.4</MicrosoftDiaSymReaderNativeVersion>
169169
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>

‎eng/pipelines/common/xplat-setup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
# Public Windows Build Pool
174174
${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}:
175175
name: $(DncEngPublicBuildPool)
176-
demands: ImageOverride -equals windows.vs2022.amd64.open
176+
demands: ImageOverride -equals windows.vs2022preview.amd64.open
177177

178178

179179
${{ if eq(parameters.helixQueuesTemplate, '') }}:

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-rtm.23506.1",
3+
"version": "8.0.100",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "8.0.100-rtm.23506.1"
8+
"dotnet": "8.0.100"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23556.5",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23556.5",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23564.4",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23564.4",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"

‎src/libraries/System.Net.Requests/src/Resources/Strings.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@
195195
<data name="net_ftp_receivefailure" xml:space="preserve">
196196
<value>The underlying connection was closed: An unexpected error occurred on a receive</value>
197197
</data>
198+
<data name="net_ftp_no_newlines" xml:space="preserve">
199+
<value>CRLF character pair is not allowed in FtpWebRequest inputs.</value>
200+
</data>
198201
<data name="net_webstatus_NameResolutionFailure" xml:space="preserve">
199202
<value>The remote name could not be resolved</value>
200203
</data>

‎src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,11 @@ private string GetPortCommandLine()
11181118
/// </summary>
11191119
private static string FormatFtpCommand(string command, string? parameter)
11201120
{
1121+
if (parameter is not null && parameter.Contains("\r\n", StringComparison.Ordinal))
1122+
{
1123+
throw new FormatException(SR.net_ftp_no_newlines);
1124+
}
1125+
11211126
return string.IsNullOrEmpty(parameter) ?
11221127
command + "\r\n" :
11231128
command + " " + parameter + "\r\n";

‎src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,9 @@ internal FtpWebRequest(Uri uri)
486486
if ((object)uri.Scheme != (object)Uri.UriSchemeFtp)
487487
throw new ArgumentOutOfRangeException(nameof(uri));
488488

489+
if (uri.OriginalString.Contains("\r\n", StringComparison.Ordinal))
490+
throw new FormatException(SR.net_ftp_no_newlines);
491+
489492
_timerCallback = new TimerThread.Callback(TimerCallback);
490493
_syncObject = new object();
491494

‎src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,27 @@ public void Ftp_RenameFileSubDir_Success(FtpExecutionMode mode)
203203
Assert.False(DirExists(mode, dir));
204204
}
205205

206+
[Fact]
207+
public void Ftp_Ignore_NewLine_Constructor_Throws_FormatException()
208+
{
209+
string uri = absoluteUri + Guid.NewGuid().ToString();
210+
211+
Assert.Throws<FormatException>(() => WebRequest.Create($"{uri}\r\n{WebRequestMethods.Ftp.AppendFile} {Guid.NewGuid().ToString()}"));
212+
}
213+
214+
[ConditionalFact(nameof(LocalServerAvailable))]
215+
public void Ftp_Ignore_NewLine_GetRequestStream_And_GetResponse_Throws_FormatException_As_InnerException()
216+
{
217+
FtpWebRequest ftpWebRequest = (FtpWebRequest)WebRequest.Create(absoluteUri + Guid.NewGuid().ToString());
218+
ftpWebRequest.Method = "APPE";
219+
ftpWebRequest.Credentials = new NetworkCredential("test\r\ntest2", "test\r\ntest2");
220+
var requestException = Assert.Throws<WebException>(() => ftpWebRequest.GetRequestStream());
221+
Assert.True(requestException.InnerException is FormatException);
222+
223+
var responseException = Assert.Throws<WebException>(() => ftpWebRequest.GetResponse());
224+
Assert.True(responseException.InnerException is FormatException);
225+
}
226+
206227
private static async Task<MemoryStream> DoAsync(FtpWebRequest request, MemoryStream requestBody)
207228
{
208229
if (requestBody != null)

0 commit comments

Comments
 (0)